Skip to content

Commit

Permalink
Extend deadline to fix flakiness.
Browse files Browse the repository at this point in the history
It's possible that we don't really need to assert that the pool finishes shutting down at all. Maybe the other existing assertions are enough? But I haven't bothered to look into it.

RELNOTES=n/a

-------------
Created by MOE: https://github.com/google/moe
MOE_MIGRATED_REVID=304194678
  • Loading branch information
cpovirk authored and nick-someone committed Apr 2, 2020
1 parent 89450c2 commit d86c850
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 2 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -77,7 +77,7 @@ public void setUp() {
@Override
public void tearDown() throws InterruptedException {
threadPool.shutdown();
assertTrue("Some worker didn't finish in time", threadPool.awaitTermination(1, SECONDS));
assertTrue("Some worker didn't finish in time", threadPool.awaitTermination(10, SECONDS));
}

private static <T> int drain(
Expand Down
2 changes: 1 addition & 1 deletion guava-tests/test/com/google/common/collect/QueuesTest.java
Original file line number Diff line number Diff line change
Expand Up @@ -77,7 +77,7 @@ public void setUp() {
@Override
public void tearDown() throws InterruptedException {
threadPool.shutdown();
assertTrue("Some worker didn't finish in time", threadPool.awaitTermination(1, SECONDS));
assertTrue("Some worker didn't finish in time", threadPool.awaitTermination(10, SECONDS));
}

private static <T> int drain(
Expand Down

0 comments on commit d86c850

Please sign in to comment.