merged trunk into 4.2 branch

diff --git a/system/TestPlc.py b/system/TestPlc.py
index e497270..b99b621 100644 (file)
--- a/system/TestPlc.py
+++ b/system/TestPlc.py
@@ -669,7 +669,7 @@ class TestPlc:
         return True
         
     def nodes_ssh(self):
-        return self.do_nodes_ssh(minutes=10,gracetime=5)
+        return self.do_nodes_ssh(minutes=30,gracetime=5)
     
     @node_mapper
     def init_node (self): pass

diff --git a/system/TestSlice.py b/system/TestSlice.py
index a72c680..3ec6cb7 100644 (file)
--- a/system/TestSlice.py
+++ b/system/TestSlice.py
@@ -129,4 +129,3 @@ class TestSlice:
             time.sleep (period)
         # for an empty slice
         return True
-