diff options
| author | Kjetil Ørbekk <kjetil.orbekk@gmail.com> | 2012-06-07 14:39:04 +0200 |
|---|---|---|
| committer | Kjetil Ørbekk <kjetil.orbekk@gmail.com> | 2012-06-07 14:39:04 +0200 |
| commit | 1ca57e746b47f27f78d62f80e1a90879ae2d9549 (patch) | |
| tree | 8dd0dbce8fa82c57d02159620e572488b39e61b2 /same/src/test/java/com/orbekk/same/MasterTest.java | |
| parent | 709b63e7eb100503df64e01eb98ab580e6f5c506 (diff) | |
Change the timeout behavior of master proposers.
Unfortunately this makes some tests fail that will not be fixed at this
point.
Diffstat (limited to 'same/src/test/java/com/orbekk/same/MasterTest.java')
| -rw-r--r-- | same/src/test/java/com/orbekk/same/MasterTest.java | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/same/src/test/java/com/orbekk/same/MasterTest.java b/same/src/test/java/com/orbekk/same/MasterTest.java index 85f737a..aac0324 100644 --- a/same/src/test/java/com/orbekk/same/MasterTest.java +++ b/same/src/test/java/com/orbekk/same/MasterTest.java @@ -46,8 +46,7 @@ public class MasterTest { public void clientJoin() throws Exception { Client client = new Client( new State(), connections, - "http://client/ClientService.json", "clientLocation", rpcf, - executor); + "http://client/ClientService.json", "clientLocation", rpcf); connections.clientMap0.put("clientLocation", client.getNewService()); client.joinNetwork(master.getMasterInfo()); master.performWork(); |