diff options
author | Kjetil Ørbekk <kjetil.orbekk@gmail.com> | 2012-03-20 11:03:42 +0100 |
---|---|---|
committer | Kjetil Ørbekk <kjetil.orbekk@gmail.com> | 2012-03-20 11:03:42 +0100 |
commit | 9b4a756388aef165b892ae478cf1b0cbf1d7130b (patch) | |
tree | 926a4994b0f02c1b9c73553e20d2150a53a36d7f /same/src/test | |
parent | f238785c99d2446e75761711b55c39dba79f1f45 (diff) |
Abort master proposal when master has been elected.
Note: This doesn't really work. We need to do this based on serial
number, otherwise the proposal may be canceled before it has begun,
with the result that the proposal doesn't get canceled at all.
Diffstat (limited to 'same/src/test')
-rw-r--r-- | same/src/test/java/com/orbekk/same/FunctionalTest.java | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/same/src/test/java/com/orbekk/same/FunctionalTest.java b/same/src/test/java/com/orbekk/same/FunctionalTest.java index 9380409..fb8bd10 100644 --- a/same/src/test/java/com/orbekk/same/FunctionalTest.java +++ b/same/src/test/java/com/orbekk/same/FunctionalTest.java @@ -120,6 +120,8 @@ public class FunctionalTest { } }; client1.setMasterController(controller); + client2.setMasterController(controller); + client3.setMasterController(controller); client1.startMasterElection(); newMaster.performWork(); assertThat(client1.masterUrl, is(newMasterUrl)); |