diff options
author | Tor Brede Vekterli <vekterli@verizonmedia.com> | 2019-03-19 14:26:38 +0100 |
---|---|---|
committer | Tor Brede Vekterli <vekterli@verizonmedia.com> | 2019-03-20 16:56:58 +0100 |
commit | 8e97c4683e01a64398fcd8d7046c6dd8dd3f45c6 (patch) | |
tree | 548c5cbc92153d22a370618c357f245fb86dd31d /clustercontroller-core/src/test/java/com/yahoo/vespa/clustercontroller/core/WantedStateTest.java | |
parent | 030f5a27899cb6e3ec09cf1dcb0cc433a871db89 (diff) |
Explicitly enable two-phase transitions in tests, disable in default options
Mirrors the default values in the actual underlying config definitions.
Diffstat (limited to 'clustercontroller-core/src/test/java/com/yahoo/vespa/clustercontroller/core/WantedStateTest.java')
-rw-r--r-- | clustercontroller-core/src/test/java/com/yahoo/vespa/clustercontroller/core/WantedStateTest.java | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/clustercontroller-core/src/test/java/com/yahoo/vespa/clustercontroller/core/WantedStateTest.java b/clustercontroller-core/src/test/java/com/yahoo/vespa/clustercontroller/core/WantedStateTest.java index 6e5b40aa7d9..bc7ee6adee1 100644 --- a/clustercontroller-core/src/test/java/com/yahoo/vespa/clustercontroller/core/WantedStateTest.java +++ b/clustercontroller-core/src/test/java/com/yahoo/vespa/clustercontroller/core/WantedStateTest.java @@ -10,7 +10,7 @@ public class WantedStateTest extends FleetControllerTest { @Test public void testSettingStorageNodeMaintenanceAndBack() throws Exception { startingTest("WantedStateTest::testSettingStorageNodeMaintenanceAndBack()"); - setUpFleetController(true, new FleetControllerOptions("mycluster")); + setUpFleetController(true, defaultOptions("mycluster")); setUpVdsNodes(true, new DummyVdsNodeOptions()); waitForStableSystem(); @@ -24,7 +24,7 @@ public class WantedStateTest extends FleetControllerTest { @Test public void testOverridingWantedStateOtherReason() throws Exception { startingTest("WantedStateTest::testOverridingWantedStateOtherReason()"); - setUpFleetController(true, new FleetControllerOptions("mycluster")); + setUpFleetController(true, defaultOptions("mycluster")); setUpVdsNodes(true, new DummyVdsNodeOptions()); waitForStableSystem(); |