summaryrefslogtreecommitdiff
path: root/same/src/test/java
diff options
context:
space:
mode:
authorKjetil Ørbekk <kjetil.orbekk@gmail.com>2012-04-25 14:37:02 +0200
committerKjetil Ørbekk <kjetil.orbekk@gmail.com>2012-04-25 14:37:56 +0200
commit9d525aa042c6fb4111e88d7913ede66aba6e24db (patch)
tree0e6eed38f60ac9fe95774afb5e02cf3cd5c50599 /same/src/test/java
parent1cde431ec7e0f5f29ec329c1949c7f5c76366ce5 (diff)
Make sure to report the *correct* failed master.
Diffstat (limited to 'same/src/test/java')
-rw-r--r--same/src/test/java/com/orbekk/same/FunctionalTest.java4
1 files changed, 2 insertions, 2 deletions
diff --git a/same/src/test/java/com/orbekk/same/FunctionalTest.java b/same/src/test/java/com/orbekk/same/FunctionalTest.java
index 2a73656..7b50b5a 100644
--- a/same/src/test/java/com/orbekk/same/FunctionalTest.java
+++ b/same/src/test/java/com/orbekk/same/FunctionalTest.java
@@ -147,7 +147,7 @@ public class FunctionalTest {
client1.setMasterController(controller);
client2.setMasterController(controller);
client3.setMasterController(controller);
- client1.startMasterElection();
+ client1.startMasterElection(master.getMasterInfo());
awaitExecution();
newMaster.performWork();
assertThat(client1.getMaster().getMasterLocation(), is(newMasterLocation));
@@ -176,7 +176,7 @@ public class FunctionalTest {
client1.setMasterController(controller);
client2.setMasterController(controller);
client3.setMasterController(controller);
- client1.startMasterElection();
+ client1.startMasterElection(master.getMasterInfo());
awaitExecution();
newMaster.performWork();
assertThat(client1.getMaster().getMasterUrl(), is(newMasterUrl));