summaryrefslogtreecommitdiffstats
path: root/configserver
diff options
context:
space:
mode:
authorHarald Musum <musum@yahoo-inc.com>2017-05-23 13:21:35 +0200
committerHarald Musum <musum@yahoo-inc.com>2017-05-23 13:21:35 +0200
commit4fd5234350787a68aec740d2c1cbfdaa00ba8e0c (patch)
treeb3e659e2455e810c2f5136ccfeef1fc83733d0af /configserver
parentaaca2350ade401c521e4127d294593c26e0c77fc (diff)
Now have to wait until rpc server is up before checking version upgraded to
Diffstat (limited to 'configserver')
-rw-r--r--configserver/src/test/java/com/yahoo/vespa/config/server/ConfigServerBootstrapTest.java2
1 files changed, 1 insertions, 1 deletions
diff --git a/configserver/src/test/java/com/yahoo/vespa/config/server/ConfigServerBootstrapTest.java b/configserver/src/test/java/com/yahoo/vespa/config/server/ConfigServerBootstrapTest.java
index 29d3273a527..5fbe4fba64d 100644
--- a/configserver/src/test/java/com/yahoo/vespa/config/server/ConfigServerBootstrapTest.java
+++ b/configserver/src/test/java/com/yahoo/vespa/config/server/ConfigServerBootstrapTest.java
@@ -44,10 +44,10 @@ public class ConfigServerBootstrapTest extends TestWithTenant {
VersionState versionState = new VersionState(versionFile);
assertTrue(versionState.isUpgraded());
ConfigServerBootstrap bootstrap = new ConfigServerBootstrap(tenants, rpc, (application, timeout) -> Optional.empty(), versionState);
+ waitUntilStarted(rpc, 60000);
assertFalse(versionState.isUpgraded());
assertThat(versionState.currentVersion(), is(versionState.storedVersion()));
assertThat(IOUtils.readAll(new FileReader(versionFile)), is(versionState.currentVersion().toSerializedForm()));
- waitUntilStarted(rpc, 60000);
assertTrue(rpc.started);
assertFalse(rpc.stopped);
bootstrap.deconstruct();