Skip to content

Commit 1354c34

Browse files
authored
1.x: change test heap size to avoid 137 (ReactiveX#4180)
* 1.x: increase test heap to 3GB * Try with less memory plus avoid a deadlock * Increase timeout for JCTools tests
1 parent 97c4e53 commit 1354c34

File tree

3 files changed

+7
-7
lines changed

3 files changed

+7
-7
lines changed

build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@ if (project.hasProperty('release.useLastTag')) {
6161
}
6262

6363
test{
64-
maxHeapSize = "2g"
64+
maxHeapSize = "1500m"
6565
}
6666

6767
license {

src/test/java/rx/internal/operators/DeferredScalarSubscriberTest.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -341,8 +341,8 @@ public void call() {
341341

342342
@Test
343343
public void emissionRequestRace2() {
344-
Worker w = Schedulers.computation().createWorker();
345-
Worker w2 = Schedulers.computation().createWorker();
344+
Worker w = Schedulers.io().createWorker();
345+
Worker w2 = Schedulers.io().createWorker();
346346
try {
347347
for (int i = 0; i < 10000; i++) {
348348

src/test/java/rx/internal/util/JCToolsQueueTests.java

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -132,7 +132,7 @@ public void testMpscLinkedAtomicQueueOfferPoll() {
132132
testOfferPoll(q);
133133
}
134134

135-
@Test(timeout = 2000)
135+
@Test(timeout = 20000)
136136
public void testMpscLinkedAtomicQueuePipelined() throws InterruptedException {
137137
final MpscLinkedAtomicQueue<Integer> q = new MpscLinkedAtomicQueue<Integer>();
138138

@@ -202,7 +202,7 @@ public void testMpscLinkedQueueOfferPoll() {
202202

203203
testOfferPoll(q);
204204
}
205-
@Test(timeout = 2000)
205+
@Test(timeout = 20000)
206206
public void testMpscLinkedQueuePipelined() throws InterruptedException {
207207
if (!UnsafeAccess.isUnsafeAvailable()) {
208208
return;
@@ -356,7 +356,7 @@ public void testSpscLinkedAtomicQueueOfferPoll() {
356356
testOfferPoll(q);
357357
}
358358

359-
@Test(timeout = 2000)
359+
@Test(timeout = 20000)
360360
public void testSpscLinkedAtomicQueuePipelined() throws InterruptedException {
361361
final SpscLinkedAtomicQueue<Integer> q = new SpscLinkedAtomicQueue<Integer>();
362362
final AtomicInteger count = new AtomicInteger();
@@ -411,7 +411,7 @@ public void testSpscLinkedQueueOfferPoll() {
411411
testOfferPoll(q);
412412
}
413413

414-
@Test(timeout = 2000)
414+
@Test(timeout = 20000)
415415
public void testSpscLinkedQueuePipelined() throws InterruptedException {
416416
if (!UnsafeAccess.isUnsafeAvailable()) {
417417
return;

0 commit comments

Comments
 (0)