Skip to content

Commit adda38b

Browse files
marcospereiraslandelle
authored andcommitted
Avoid using gatling.io in tests
gatling.io uses TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384 but branch 2.0 uses an old Netty version that uses to filtering it out, see netty/netty#9274
1 parent f691347 commit adda38b

File tree

3 files changed

+9
-9
lines changed

3 files changed

+9
-9
lines changed

client/src/test/java/org/asynchttpclient/channel/MaxTotalConnectionTest.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,7 @@ public void testMaxTotalConnectionsExceedingException() throws IOException {
7373

7474
@Test(groups = "online")
7575
public void testMaxTotalConnections() throws Exception {
76-
String[] urls = new String[] { "http://google.com", "https://gatling.io" };
76+
String[] urls = new String[] { "https://www.google.com/", "https://github.com" };
7777

7878
final CountDownLatch latch = new CountDownLatch(2);
7979
final AtomicReference<Throwable> ex = new AtomicReference<>();

extras/jdeferred/src/test/java/org/asynchttpclient/extra/AsyncHttpTest.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ public void testPromiseAdapter() throws IOException {
4141
final AtomicInteger progressCount = new AtomicInteger();
4242

4343
try (AsyncHttpClient client = asyncHttpClient()) {
44-
Promise<Response, Throwable, HttpProgress> p1 = AsyncHttpDeferredObject.promise(client.prepareGet("https://gatling.io"));
44+
Promise<Response, Throwable, HttpProgress> p1 = AsyncHttpDeferredObject.promise(client.prepareGet("https://www.google.com"));
4545
p1.done(new DoneCallback<Response>() {
4646
@Override
4747
public void onDone(Response response) {
@@ -72,8 +72,8 @@ public void testMultiplePromiseAdapter() throws IOException {
7272
final AtomicInteger successCount = new AtomicInteger();
7373

7474
try (AsyncHttpClient client = asyncHttpClient()) {
75-
Promise<Response, Throwable, HttpProgress> p1 = AsyncHttpDeferredObject.promise(client.prepareGet("https://gatling.io"));
76-
Promise<Response, Throwable, HttpProgress> p2 = AsyncHttpDeferredObject.promise(client.prepareGet("http://www.google.com"));
75+
Promise<Response, Throwable, HttpProgress> p1 = AsyncHttpDeferredObject.promise(client.prepareGet("https://github.com"));
76+
Promise<Response, Throwable, HttpProgress> p2 = AsyncHttpDeferredObject.promise(client.prepareGet("https://www.google.com"));
7777
AsyncHttpDeferredObject deferredRequest = new AsyncHttpDeferredObject(client.prepareGet("http://jdeferred.org"));
7878

7979
deferredManager.when(p1, p2, deferredRequest).then(new DoneCallback<MultipleResults>() {

extras/rxjava/src/test/java/org/asynchttpclient/extras/rxjava/AsyncHttpObservableTest.java

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ public void testToObservableNoError() {
3131
final TestSubscriber<Response> tester = new TestSubscriber<>();
3232

3333
try (AsyncHttpClient client = asyncHttpClient()) {
34-
Observable<Response> o1 = AsyncHttpObservable.toObservable(() -> client.prepareGet("https://gatling.io"));
34+
Observable<Response> o1 = AsyncHttpObservable.toObservable(() -> client.prepareGet("https://www.google.com"));
3535
o1.subscribe(tester);
3636
tester.awaitTerminalEvent();
3737
tester.assertTerminalEvent();
@@ -51,7 +51,7 @@ public void testToObservableError() {
5151
final TestSubscriber<Response> tester = new TestSubscriber<>();
5252

5353
try (AsyncHttpClient client = asyncHttpClient()) {
54-
Observable<Response> o1 = AsyncHttpObservable.toObservable(() -> client.prepareGet("https://gatling.io/ttfn"));
54+
Observable<Response> o1 = AsyncHttpObservable.toObservable(() -> client.prepareGet("https://www.google.com/ttfn"));
5555
o1.subscribe(tester);
5656
tester.awaitTerminalEvent();
5757
tester.assertTerminalEvent();
@@ -71,7 +71,7 @@ public void testObserveNoError() {
7171
final TestSubscriber<Response> tester = new TestSubscriber<>();
7272

7373
try (AsyncHttpClient client = asyncHttpClient()) {
74-
Observable<Response> o1 = AsyncHttpObservable.observe(() -> client.prepareGet("https://gatling.io"));
74+
Observable<Response> o1 = AsyncHttpObservable.observe(() -> client.prepareGet("https://www.google.com"));
7575
o1.subscribe(tester);
7676
tester.awaitTerminalEvent();
7777
tester.assertTerminalEvent();
@@ -91,7 +91,7 @@ public void testObserveError() {
9191
final TestSubscriber<Response> tester = new TestSubscriber<>();
9292

9393
try (AsyncHttpClient client = asyncHttpClient()) {
94-
Observable<Response> o1 = AsyncHttpObservable.observe(() -> client.prepareGet("https://gatling.io/ttfn"));
94+
Observable<Response> o1 = AsyncHttpObservable.observe(() -> client.prepareGet("https://www.google.com/ttfn"));
9595
o1.subscribe(tester);
9696
tester.awaitTerminalEvent();
9797
tester.assertTerminalEvent();
@@ -111,7 +111,7 @@ public void testObserveMultiple() {
111111
final TestSubscriber<Response> tester = new TestSubscriber<>();
112112

113113
try (AsyncHttpClient client = asyncHttpClient()) {
114-
Observable<Response> o1 = AsyncHttpObservable.observe(() -> client.prepareGet("https://gatling.io"));
114+
Observable<Response> o1 = AsyncHttpObservable.observe(() -> client.prepareGet("https://www.google.com"));
115115
Observable<Response> o2 = AsyncHttpObservable.observe(() -> client.prepareGet("http://www.wisc.edu").setFollowRedirect(true));
116116
Observable<Response> o3 = AsyncHttpObservable.observe(() -> client.prepareGet("http://www.umn.edu").setFollowRedirect(true));
117117
Observable<Response> all = Observable.merge(o1, o2, o3);

0 commit comments

Comments
 (0)