From: Tony Tkacik <ttkacik@cisco.com>
Date: Wed, 7 Jan 2015 09:42:01 +0000 (+0000)
Subject: Merge "Add timeout to netconf IT test"
X-Git-Tag: release/lithium~724
X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=commitdiff_plain;h=d51d1e8ce97983afcc39c1df65b368f921fc749d;p=controller.git

Merge "Add timeout to netconf IT test"
---

d51d1e8ce97983afcc39c1df65b368f921fc749d
diff --cc opendaylight/netconf/netconf-it/src/test/java/org/opendaylight/controller/netconf/it/NetconfITSecureTest.java
index bd8e2ed4df,31986b8afe..7d568b6462
--- a/opendaylight/netconf/netconf-it/src/test/java/org/opendaylight/controller/netconf/it/NetconfITSecureTest.java
+++ b/opendaylight/netconf/netconf-it/src/test/java/org/opendaylight/controller/netconf/it/NetconfITSecureTest.java
@@@ -111,10 -113,10 +111,10 @@@ public class NetconfITSecureTest extend
          nioExec.shutdownNow();
      }
  
-     @Test
+     @Test(timeout = 2*60*1000)
      public void testSecure() throws Exception {
          final NetconfClientDispatcher dispatch = new NetconfClientDispatcherImpl(getNettyThreadgroup(), getNettyThreadgroup(), getHashedWheelTimer());
 -        try (TestingNetconfClient netconfClient = new TestingNetconfClient("testing-ssh-client", dispatch, getClientConfiguration(new SimpleNetconfClientSessionListener()))) {
 +        try (TestingNetconfClient netconfClient = new TestingNetconfClient("testing-ssh-client", dispatch, getClientConfiguration(new SimpleNetconfClientSessionListener(), TLS_ADDRESS))) {
              NetconfMessage response = netconfClient.sendMessage(getGetConfig());
              assertFalse("Unexpected error message " + XmlUtil.toString(response.getDocument()),
                      NetconfMessageUtil.isErrorMessage(response));