Code Review
/
controller.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Merge "BUG-2310 - widen yang model for netconf-node."
[controller.git]
/
opendaylight
/
netconf
/
netconf-it
/
src
/
test
/
java
/
org
/
opendaylight
/
controller
/
netconf
/
it
/
AbstractNetconfConfigTest.java
diff --git
a/opendaylight/netconf/netconf-it/src/test/java/org/opendaylight/controller/netconf/it/AbstractNetconfConfigTest.java
b/opendaylight/netconf/netconf-it/src/test/java/org/opendaylight/controller/netconf/it/AbstractNetconfConfigTest.java
index 65810a6bdab8d840919e9f25b1d0961b499d0566..fd362f83e7d793f0accff7a25aa3d9d5207f6d0e 100644
(file)
--- a/
opendaylight/netconf/netconf-it/src/test/java/org/opendaylight/controller/netconf/it/AbstractNetconfConfigTest.java
+++ b/
opendaylight/netconf/netconf-it/src/test/java/org/opendaylight/controller/netconf/it/AbstractNetconfConfigTest.java
@@
-34,6
+34,7
@@
import java.util.Collection;
import java.util.Collections;
import java.util.HashSet;
import java.util.List;
import java.util.Collections;
import java.util.HashSet;
import java.util.List;
+import java.util.concurrent.TimeUnit;
import org.apache.commons.io.IOUtils;
import org.junit.After;
import org.junit.Before;
import org.apache.commons.io.IOUtils;
import org.junit.After;
import org.junit.Before;
@@
-77,6
+78,7
@@
public abstract class AbstractNetconfConfigTest extends AbstractConfigTest {
public static final String LOOPBACK_ADDRESS = "127.0.0.1";
public static final int SERVER_CONNECTION_TIMEOUT_MILLIS = 5000;
public static final String LOOPBACK_ADDRESS = "127.0.0.1";
public static final int SERVER_CONNECTION_TIMEOUT_MILLIS = 5000;
+ private static final int RESOURCE_TIMEOUT_MINUTES = 2;
static ModuleFactory[] FACTORIES = {new TestImplModuleFactory(),
new DepTestImplModuleFactory(),
static ModuleFactory[] FACTORIES = {new TestImplModuleFactory(),
new DepTestImplModuleFactory(),
@@
-145,7
+147,7
@@
public abstract class AbstractNetconfConfigTest extends AbstractConfigTest {
} else {
s = dispatch.createServer(((InetSocketAddress) getTcpServerAddress()));
}
} else {
s = dispatch.createServer(((InetSocketAddress) getTcpServerAddress()));
}
- s.await();
+ s.await(
RESOURCE_TIMEOUT_MINUTES, TimeUnit.MINUTES
);
return s.channel();
}
return s.channel();
}
@@
-230,9
+232,9
@@
public abstract class AbstractNetconfConfigTest extends AbstractConfigTest {
*/
@After
public void cleanUpNetconf() throws Exception {
*/
@After
public void cleanUpNetconf() throws Exception {
- serverTcpChannel.close().await();
+ serverTcpChannel.close().await(
RESOURCE_TIMEOUT_MINUTES, TimeUnit.MINUTES
);
hashedWheelTimer.stop();
hashedWheelTimer.stop();
- nettyThreadgroup.shutdownGracefully().await();
+ nettyThreadgroup.shutdownGracefully().await(
RESOURCE_TIMEOUT_MINUTES, TimeUnit.MINUTES
);
}
public NetconfClientConfiguration getClientConfiguration(final InetSocketAddress tcpAddress, final int timeout) {
}
public NetconfClientConfiguration getClientConfiguration(final InetSocketAddress tcpAddress, final int timeout) {