commit 1b9f4dcfd44d11b097f393e4f0faf79c37147d80
author Yuta HIGUCHI <y-higuchi@onlab.us> Mon Sep 22 10:25:06 2014 -0700
committer Yuta HIGUCHI <y-higuchi@onlab.us> Mon Sep 22 10:26:46 2014 -0700
tree c61fb9dcd317324cf69d228f3deb6a1ee617c2fc
parent 39a04805b7b57c4c6e215103df5d15160a5a75d7

HZ to use TCP during unit tests

Change-Id: I0cb4269523f1c2689076b8a8cfca10a422a9d46a

core/net/src/test/java/org/onlab/onos/net/device/impl/DistributedDeviceManagerTest.java

diff --git a/core/net/src/test/java/org/onlab/onos/net/device/impl/DistributedDeviceManagerTest.java b/core/net/src/test/java/org/onlab/onos/net/device/impl/DistributedDeviceManagerTest.java
index 6502373..54da6ce 100644
--- a/core/net/src/test/java/org/onlab/onos/net/device/impl/DistributedDeviceManagerTest.java
+++ b/core/net/src/test/java/org/onlab/onos/net/device/impl/DistributedDeviceManagerTest.java
@@ -2,7 +2,6 @@
 
 import org.junit.After;
 import org.junit.Before;
-import org.junit.Ignore;
 import org.junit.Test;
 import org.onlab.onos.event.Event;
 import org.onlab.onos.net.Device;
@@ -46,7 +45,6 @@
 /**
  * Test codifying the device service & device provider service contracts.
  */
-@Ignore
 public class DistributedDeviceManagerTest {
 
     private static final ProviderId PID = new ProviderId("of", "foo");
@@ -84,8 +82,12 @@
         // avoid accidentally joining other cluster
         config.getGroupConfig().setName(UUID.randomUUID().toString());
         // quickly form single node cluster
-        config.getNetworkConfig().getJoin().getMulticastConfig()
-            .setMulticastTimeoutSeconds(0);
+        config.getNetworkConfig().getJoin()
+            .getTcpIpConfig()
+            .setEnabled(true).setConnectionTimeoutSeconds(0);
+        config.getNetworkConfig().getJoin()
+            .getMulticastConfig()
+            .setEnabled(false);
         dstore.theInstance = Hazelcast.newHazelcastInstance(config);
         dstore.activate();
         mgr.store = dstore;