Skip to content

1.x: change test heap size to avoid 137 #4180

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Jul 9, 2016
Merged

1.x: change test heap size to avoid 137 #4180

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
a402aa8
1.x: increase test heap to 3GB
akarnokd Jul 8, 2016
b054943
Try with less memory plus avoid a deadlock
akarnokd Jul 8, 2016
9129b99
Increase timeout for JCTools tests
akarnokd Jul 9, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@ if (project.hasProperty('release.useLastTag')) {
}

test{
maxHeapSize = "2g"
maxHeapSize = "1500m"
}

license {
Expand Down
4 changes: 2 additions & 2 deletions src/test/java/rx/internal/operators/DeferredScalarSubscriberTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -341,8 +341,8 @@ public void call() {

@Test
public void emissionRequestRace2() {
Worker w = Schedulers.computation().createWorker();
Worker w2 = Schedulers.computation().createWorker();
Worker w = Schedulers.io().createWorker();
Worker w2 = Schedulers.io().createWorker();
try {
for (int i = 0; i < 10000; i++) {

Expand Down
8 changes: 4 additions & 4 deletions src/test/java/rx/internal/util/JCToolsQueueTests.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -132,7 +132,7 @@ public void testMpscLinkedAtomicQueueOfferPoll() {
testOfferPoll(q);
}

@Test(timeout = 2000)
@Test(timeout = 20000)
public void testMpscLinkedAtomicQueuePipelined() throws InterruptedException {
final MpscLinkedAtomicQueue<Integer> q = new MpscLinkedAtomicQueue<Integer>();

Expand Down Expand Up @@ -202,7 +202,7 @@ public void testMpscLinkedQueueOfferPoll() {

testOfferPoll(q);
}
@Test(timeout = 2000)
@Test(timeout = 20000)
public void testMpscLinkedQueuePipelined() throws InterruptedException {
if (!UnsafeAccess.isUnsafeAvailable()) {
return;
Expand Down Expand Up @@ -356,7 +356,7 @@ public void testSpscLinkedAtomicQueueOfferPoll() {
testOfferPoll(q);
}

@Test(timeout = 2000)
@Test(timeout = 20000)
public void testSpscLinkedAtomicQueuePipelined() throws InterruptedException {
final SpscLinkedAtomicQueue<Integer> q = new SpscLinkedAtomicQueue<Integer>();
final AtomicInteger count = new AtomicInteger();
Expand Down Expand Up @@ -411,7 +411,7 @@ public void testSpscLinkedQueueOfferPoll() {
testOfferPoll(q);
}

@Test(timeout = 2000)
@Test(timeout = 20000)
public void testSpscLinkedQueuePipelined() throws InterruptedException {
if (!UnsafeAccess.isUnsafeAvailable()) {
return;
Expand Down