aboutsummaryrefslogtreecommitdiffstats
path: root/configserver/src/test
diff options
context:
space:
mode:
authorJon Bratseth <bratseth@oath.com>2018-06-01 12:24:39 +0200
committerJon Bratseth <bratseth@oath.com>2018-06-01 12:24:39 +0200
commit122608d88e4eb2e156df8938211b76e930a1774b (patch)
treeca0367691a3a3e9f437819896c0327b9e9fff340 /configserver/src/test
parent23214db58a8fd400dd6776eee79613c2f059c483 (diff)
Internal redeploy Depoyer.deployFromLocalActive -> ApplicationMetaData
Diffstat (limited to 'configserver/src/test')
-rw-r--r--configserver/src/test/java/com/yahoo/vespa/config/server/deploy/HostedDeployTest.java9
1 files changed, 8 insertions, 1 deletions
diff --git a/configserver/src/test/java/com/yahoo/vespa/config/server/deploy/HostedDeployTest.java b/configserver/src/test/java/com/yahoo/vespa/config/server/deploy/HostedDeployTest.java
index 9b40784018a..b151ac57352 100644
--- a/configserver/src/test/java/com/yahoo/vespa/config/server/deploy/HostedDeployTest.java
+++ b/configserver/src/test/java/com/yahoo/vespa/config/server/deploy/HostedDeployTest.java
@@ -15,6 +15,7 @@ import com.yahoo.config.provision.Zone;
import com.yahoo.test.ManualClock;
import static com.yahoo.vespa.config.server.deploy.DeployTester.CountingModelFactory;
+import com.yahoo.vespa.config.server.session.LocalSession;
import org.junit.Ignore;
import org.junit.Test;
@@ -50,12 +51,18 @@ public class HostedDeployTest {
@Test
public void testRedeploy() {
DeployTester tester = new DeployTester("src/test/apps/hosted/", createConfigserverConfig());
- tester.deployApp("myApp", Instant.now());
+ ApplicationId appId = tester.deployApp("myApp", Instant.now());
+ LocalSession s1 = tester.applicationRepository().getActiveSession(appId);
+ System.out.println("First session: " + s1.getSessionId());
+ assertFalse(tester.applicationRepository().getActiveSession(appId).getMetaData().isInternalRedeploy());
Optional<com.yahoo.config.provision.Deployment> deployment = tester.redeployFromLocalActive();
assertTrue(deployment.isPresent());
deployment.get().prepare();
deployment.get().activate();
+ LocalSession s2 = tester.applicationRepository().getActiveSession(appId);
+ System.out.println("Second session: " + s2.getSessionId());
+ assertTrue(tester.applicationRepository().getActiveSession(appId).getMetaData().isInternalRedeploy());
}
@Test