Update Testtools to Nitrogen

Change-Id: I711495d7b67e8cc7867cbb85863d47f8a638b3b2
Signed-off-by: Christophe Betoule <christophe.betoule@orange.com>

diff --git a/tests/netconf b/tests/netconf
index dab855eadfc232f85bd281fdcb816cef127f13f0..b5505bd7a925c66f59687a17d4e0e855f5cb6939 160000 (submodule)
--- a/tests/netconf
+++ b/tests/netconf
@@ -1 +1 @@
-Subproject commit dab855eadfc232f85bd281fdcb816cef127f13f0
+Subproject commit b5505bd7a925c66f59687a17d4e0e855f5cb6939

diff --git a/tests/start.sh b/tests/start.sh
index 9f0da48b7278fec2e8358850a04a598f36428dbd..827273d403903677258d0e7f00f9c70200e7afbe 100755 (executable)
--- a/tests/start.sh
+++ b/tests/start.sh
@@ -9,7 +9,7 @@
 # opts="${opts} --ssh tcp"
 # opts="${opts} --notification-file notif.xml"
 
-java -jar ./netconf/netconf/tools/netconf-testtool/target/netconf-testtool-1.3.0-SNAPSHOT-executable.jar \
+java -jar ./netconf/netconf/tools/netconf-testtool/target/netconf-testtool-1.3.1-SNAPSHOT-executable.jar \
      --schemas-dir schemas \
      --initial-config-xml-file sample-config-ROADM.xml \
      ${opts}

diff --git a/tests/transportpce_tests/test_portmapping.py b/tests/transportpce_tests/test_portmapping.py
index 4e9c3904ec57710d3147c9071fe31ecfe77d1ed7..f386abf0db94239d7292f671075c2c02b4dcd457 100644 (file)
--- a/tests/transportpce_tests/test_portmapping.py
+++ b/tests/transportpce_tests/test_portmapping.py
@@ -1,4 +1,5 @@
 #!/usr/bin/env python
+
 ##############################################################################
 #Copyright (c) 2017 Orange, Inc. and others.  All rights reserved.
 #
@@ -28,7 +29,7 @@ class TransportPCEtesting(unittest.TestCase):
     @classmethod
     def __start_testtools(cls):
         executable = ("./netconf/netconf/tools/netconf-testtool/target/"
-                      "netconf-testtool-1.3.0-SNAPSHOT-executable.jar")
+                      "netconf-testtool-1.3.1-SNAPSHOT-executable.jar")
         if os.path.isfile(executable):
             with open('testtools.log', 'w') as outfile:
                 cls.testtools_process = subprocess.Popen(