Code Review
/
controller.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Stop using deprecated pax Configuration annotation. Move the code to use
[controller.git]
/
opendaylight
/
northbound
/
integrationtest
/
src
/
test
/
java
/
org
/
opendaylight
/
controller
/
northbound
/
integrationtest
/
NorthboundIT.java
diff --git
a/opendaylight/northbound/integrationtest/src/test/java/org/opendaylight/controller/northbound/integrationtest/NorthboundIT.java
b/opendaylight/northbound/integrationtest/src/test/java/org/opendaylight/controller/northbound/integrationtest/NorthboundIT.java
index 3f3aec08ed8287392ca5c3ed390e41a400c431e4..6829fadff566b452e0ec92f96d79cd92d905b45f 100644
(file)
--- a/
opendaylight/northbound/integrationtest/src/test/java/org/opendaylight/controller/northbound/integrationtest/NorthboundIT.java
+++ b/
opendaylight/northbound/integrationtest/src/test/java/org/opendaylight/controller/northbound/integrationtest/NorthboundIT.java
@@
-45,7
+45,7
@@
import org.opendaylight.controller.sal.topology.TopoEdgeUpdate;
import org.opendaylight.controller.switchmanager.IInventoryListener;
import org.opendaylight.controller.usermanager.IUserManager;
import org.ops4j.pax.exam.Option;
import org.opendaylight.controller.switchmanager.IInventoryListener;
import org.opendaylight.controller.usermanager.IUserManager;
import org.ops4j.pax.exam.Option;
-import org.ops4j.pax.exam.
junit.
Configuration;
+import org.ops4j.pax.exam.Configuration;
import org.ops4j.pax.exam.junit.PaxExam;
import org.ops4j.pax.exam.util.PathUtils;
import org.osgi.framework.Bundle;
import org.ops4j.pax.exam.junit.PaxExam;
import org.ops4j.pax.exam.util.PathUtils;
import org.osgi.framework.Bundle;
@@
-153,7
+153,11
@@
public class NorthboundIT {
request.setUri(restUrl);
request.setMethod(method);
request.setUri(restUrl);
request.setMethod(method);
- request.setTimeout(5000); // HostTracker doesn't respond within 3 seconds
+ request.setTimeout(0); // HostTracker doesn't respond
+ // within default timeout during
+ // IT so setting an indefinite
+ // timeout till the issue is
+ // sorted out
Map<String, List<String>> headers = new HashMap<String, List<String>>();
String authString = "admin:admin";
Map<String, List<String>> headers = new HashMap<String, List<String>>();
String authString = "admin:admin";