HZ to use TCP during unit tests
Change-Id: I0cb4269523f1c2689076b8a8cfca10a422a9d46a
Showing
1 changed file
with
6 additions
and
4 deletions
... | @@ -2,7 +2,6 @@ package org.onlab.onos.net.device.impl; | ... | @@ -2,7 +2,6 @@ package org.onlab.onos.net.device.impl; |
2 | 2 | ||
3 | import org.junit.After; | 3 | import org.junit.After; |
4 | import org.junit.Before; | 4 | import org.junit.Before; |
5 | -import org.junit.Ignore; | ||
6 | import org.junit.Test; | 5 | import org.junit.Test; |
7 | import org.onlab.onos.event.Event; | 6 | import org.onlab.onos.event.Event; |
8 | import org.onlab.onos.net.Device; | 7 | import org.onlab.onos.net.Device; |
... | @@ -46,7 +45,6 @@ import static org.onlab.onos.net.device.DeviceEvent.Type.*; | ... | @@ -46,7 +45,6 @@ import static org.onlab.onos.net.device.DeviceEvent.Type.*; |
46 | /** | 45 | /** |
47 | * Test codifying the device service & device provider service contracts. | 46 | * Test codifying the device service & device provider service contracts. |
48 | */ | 47 | */ |
49 | -@Ignore | ||
50 | public class DistributedDeviceManagerTest { | 48 | public class DistributedDeviceManagerTest { |
51 | 49 | ||
52 | private static final ProviderId PID = new ProviderId("of", "foo"); | 50 | private static final ProviderId PID = new ProviderId("of", "foo"); |
... | @@ -84,8 +82,12 @@ public class DistributedDeviceManagerTest { | ... | @@ -84,8 +82,12 @@ public class DistributedDeviceManagerTest { |
84 | // avoid accidentally joining other cluster | 82 | // avoid accidentally joining other cluster |
85 | config.getGroupConfig().setName(UUID.randomUUID().toString()); | 83 | config.getGroupConfig().setName(UUID.randomUUID().toString()); |
86 | // quickly form single node cluster | 84 | // quickly form single node cluster |
87 | - config.getNetworkConfig().getJoin().getMulticastConfig() | 85 | + config.getNetworkConfig().getJoin() |
88 | - .setMulticastTimeoutSeconds(0); | 86 | + .getTcpIpConfig() |
87 | + .setEnabled(true).setConnectionTimeoutSeconds(0); | ||
88 | + config.getNetworkConfig().getJoin() | ||
89 | + .getMulticastConfig() | ||
90 | + .setEnabled(false); | ||
89 | dstore.theInstance = Hazelcast.newHazelcastInstance(config); | 91 | dstore.theInstance = Hazelcast.newHazelcastInstance(config); |
90 | dstore.activate(); | 92 | dstore.activate(); |
91 | mgr.store = dstore; | 93 | mgr.store = dstore; | ... | ... |
-
Please register or login to post a comment