Merge "Add timeout to netconf IT test"
authorTony Tkacik <ttkacik@cisco.com>
Wed, 7 Jan 2015 09:42:01 +0000 (09:42 +0000)
committerGerrit Code Review <gerrit@opendaylight.org>
Wed, 7 Jan 2015 09:42:02 +0000 (09:42 +0000)
1  2 
opendaylight/netconf/netconf-it/src/test/java/org/opendaylight/controller/netconf/it/NetconfITSecureTest.java

index bd8e2ed4df623f4c96051429f70cadc11ed9b17f,31986b8afe522be41e1844714cd895d819b259ed..7d568b64628f82ec6499d1d9288ef6eb54b0c572
@@@ -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));