aboutsummaryrefslogtreecommitdiff
path: root/network
diff options
context:
space:
mode:
authorAaron Davidson <aaron@databricks.com>2015-01-09 09:20:16 -0800
committerAaron Davidson <aaron@databricks.com>2015-01-09 09:20:16 -0800
commitb4034c3f889bf24f60eb806802866b48e4cbe55c (patch)
tree0223f014bdb1be7ed55ec3de5f8f208d0cfd2115 /network
parentf3da4bd7289d493014ad3c5176ada60794dfcfe0 (diff)
downloadspark-b4034c3f889bf24f60eb806802866b48e4cbe55c.tar.gz
spark-b4034c3f889bf24f60eb806802866b48e4cbe55c.tar.bz2
spark-b4034c3f889bf24f60eb806802866b48e4cbe55c.zip
[Minor] Fix test RetryingBlockFetcherSuite after changed config name
Flakey due to the default retry interval being the same as our test's wait timeout. Author: Aaron Davidson <aaron@databricks.com> Closes #3972 from aarondav/fix-test and squashes the following commits: db77cab [Aaron Davidson] [Minor] Fix test after changed config name
Diffstat (limited to 'network')
-rw-r--r--network/shuffle/src/test/java/org/apache/spark/network/shuffle/RetryingBlockFetcherSuite.java4
1 files changed, 2 insertions, 2 deletions
diff --git a/network/shuffle/src/test/java/org/apache/spark/network/shuffle/RetryingBlockFetcherSuite.java b/network/shuffle/src/test/java/org/apache/spark/network/shuffle/RetryingBlockFetcherSuite.java
index 0191fe529e..1ad0d72ae5 100644
--- a/network/shuffle/src/test/java/org/apache/spark/network/shuffle/RetryingBlockFetcherSuite.java
+++ b/network/shuffle/src/test/java/org/apache/spark/network/shuffle/RetryingBlockFetcherSuite.java
@@ -54,13 +54,13 @@ public class RetryingBlockFetcherSuite {
@Before
public void beforeEach() {
System.setProperty("spark.shuffle.io.maxRetries", "2");
- System.setProperty("spark.shuffle.io.retryWaitMs", "0");
+ System.setProperty("spark.shuffle.io.retryWait", "0");
}
@After
public void afterEach() {
System.clearProperty("spark.shuffle.io.maxRetries");
- System.clearProperty("spark.shuffle.io.retryWaitMs");
+ System.clearProperty("spark.shuffle.io.retryWait");
}
@Test