diff options
| author | Martin Polden <mpolden@mpolden.no> | 2018-04-09 09:21:34 +0200 |
|---|---|---|
| committer | Martin Polden <mpolden@mpolden.no> | 2018-04-09 09:27:21 +0200 |
| commit | b34f413bfc085fa942a2f2476386e313ec75ce88 (patch) | |
| tree | 0a09b3f3bffac1a1b7139e99d48af6c561458669 /controller-server/src/test | |
| parent | 22301cab9d469105054a116974466df858dd09c0 (diff) | |
Sort applications explicitly
Diffstat (limited to 'controller-server/src/test')
| -rw-r--r-- | controller-server/src/test/java/com/yahoo/vespa/hosted/controller/maintenance/UpgraderTest.java | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/maintenance/UpgraderTest.java b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/maintenance/UpgraderTest.java index b7eff6d8448..58539bac211 100644 --- a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/maintenance/UpgraderTest.java +++ b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/maintenance/UpgraderTest.java @@ -12,7 +12,6 @@ import com.yahoo.vespa.hosted.controller.application.ApplicationPackage; import com.yahoo.vespa.hosted.controller.application.Deployment; import com.yahoo.vespa.hosted.controller.application.DeploymentJobs; import com.yahoo.vespa.hosted.controller.deployment.ApplicationPackageBuilder; -import com.yahoo.vespa.hosted.controller.deployment.BuildJob; import com.yahoo.vespa.hosted.controller.deployment.DeploymentTester; import com.yahoo.vespa.hosted.controller.versions.VespaVersion; import org.junit.Test; @@ -21,7 +20,6 @@ import java.time.Duration; import java.time.Instant; import static com.yahoo.vespa.hosted.controller.application.DeploymentJobs.JobType.component; -import static com.yahoo.vespa.hosted.controller.application.DeploymentJobs.JobType.productionEuWest1; import static com.yahoo.vespa.hosted.controller.application.DeploymentJobs.JobType.productionUsEast3; import static com.yahoo.vespa.hosted.controller.application.DeploymentJobs.JobType.productionUsWest1; import static com.yahoo.vespa.hosted.controller.application.DeploymentJobs.JobType.stagingTest; @@ -869,13 +867,13 @@ public class UpgraderTest { tester.readyJobTrigger().maintain(); assertEquals(2, tester.deploymentQueue().jobs().size()); tester.completeUpgrade(default0, version, "default"); - tester.completeUpgrade(default2, version, "default"); + tester.completeUpgrade(default1, version, "default"); // Remaining applications upgraded upgrader.maintain(); tester.readyJobTrigger().maintain(); assertEquals(2, tester.deploymentQueue().jobs().size()); - tester.completeUpgrade(default1, version, "default"); + tester.completeUpgrade(default2, version, "default"); tester.completeUpgrade(default3, version, "default"); upgrader.maintain(); tester.readyJobTrigger().maintain(); |