aboutsummaryrefslogtreecommitdiffstats
path: root/controller-server
diff options
context:
space:
mode:
authorJon Marius Venstad <venstad@gmail.com>2022-01-13 11:18:49 +0100
committerJon Marius Venstad <venstad@gmail.com>2022-01-13 11:18:49 +0100
commitbc41cd3e5d822c96f1ecedd67b955d8e1b9958de (patch)
treed94997737f8cac059f47c2e82c9f0f94a660f7ab /controller-server
parent624f7305c5e497d1fc834cd0a39734541bd2d11c (diff)
Split unit test
Diffstat (limited to 'controller-server')
-rw-r--r--controller-server/src/test/java/com/yahoo/vespa/hosted/controller/deployment/DeploymentTriggerTest.java21
1 files changed, 14 insertions, 7 deletions
diff --git a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/deployment/DeploymentTriggerTest.java b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/deployment/DeploymentTriggerTest.java
index e5c9efa280a..fd7ba8693e2 100644
--- a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/deployment/DeploymentTriggerTest.java
+++ b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/deployment/DeploymentTriggerTest.java
@@ -465,17 +465,11 @@ public class DeploymentTriggerTest {
}
@Test
- public void settingANoOpChangeIsANoOp() {
+ public void downgradingApplicationVersionWorks() {
var app = tester.newDeploymentContext().submit().deploy();
ApplicationVersion appVersion0 = app.lastSubmission().get();
app.submit().deploy();
- ApplicationVersion appVersion1 = app.lastSubmission().get();
- // Triggering a roll-out of an already deployed application is a no-op.
- assertEquals(Change.empty(), app.instance().change());
- tester.deploymentTrigger().forceChange(app.instanceId(), Change.of(appVersion1));
- assertEquals(Change.empty(), app.instance().change());
-
// Downgrading application version.
tester.deploymentTrigger().forceChange(app.instanceId(), Change.of(appVersion0));
assertEquals(Change.of(appVersion0), app.instance().change());
@@ -488,6 +482,19 @@ public class DeploymentTriggerTest {
}
@Test
+ public void settingANoOpChangeIsANoOp() {
+ var app = tester.newDeploymentContext().submit().deploy();
+ ApplicationVersion appVersion0 = app.lastSubmission().get();
+ app.submit().deploy();
+ ApplicationVersion appVersion1 = app.lastSubmission().get();
+
+ // Triggering a roll-out of an already deployed application is a no-op.
+ assertEquals(Change.empty(), app.instance().change());
+ tester.deploymentTrigger().forceChange(app.instanceId(), Change.of(appVersion1));
+ assertEquals(Change.empty(), app.instance().change());
+ }
+
+ @Test
public void stepIsCompletePreciselyWhenItShouldBe() {
var app1 = tester.newDeploymentContext("tenant1", "app1", "default");
var app2 = tester.newDeploymentContext("tenant1", "app2", "default");