rubbing off differences

diff --git a/src/nepi/resources/netns/netnsserver.py b/src/nepi/resources/netns/netnsserver.py
index 4702e16..0af5a27 100644 (file)
--- a/src/nepi/resources/netns/netnsserver.py
+++ b/src/nepi/resources/netns/netnsserver.py
@@ -112,7 +112,7 @@ def recv_msg(conn):
         item = base64.b64decode(item).rstrip()
         return pickle.loads(item)
 
-    decoded = list(map(decode, msg.split("|")))
+    decoded = [ decode(x) for x in msg.split("|")]
 
     # decoded message
     dmsg_type = decoded.pop(0)

diff --git a/test/resources/omf/omf6_vlc_traces.py b/test/resources/omf/omf6_vlc_traces.py
index 32cad80..7a922d1 100755 (executable)
--- a/test/resources/omf/omf6_vlc_traces.py
+++ b/test/resources/omf/omf6_vlc_traces.py
@@ -95,11 +95,11 @@ class OMFPingNormalCase(unittest.TestCase):
         self.assertEqual(ec.get_resource(self.channel).state, ResourceState.RELEASED)
         self.assertEqual(ec.get_resource(self.app1).state, ResourceState.RELEASED)
 
-        t = open("app1_out.txt", "r")
-        l = t.readlines()
-        self.assertEqual(l[0], "PING 10.0.0.17 (10.0.0.17) 56(84) bytes of data.\n")
-        self.assertIn("5 packets transmitted, 5 received, 0% packet loss, time", l[-2])
-        self.assertIn("rtt min/avg/max/mdev = ", l[-1])
+        with open("app1_out.txt", "r") as t:
+            l = t.readlines()
+            self.assertEqual(l[0], "PING 10.0.0.17 (10.0.0.17) 56(84) bytes of data.\n")
+            self.assertIn("5 packets transmitted, 5 received, 0% packet loss, time", l[-2])
+            self.assertIn("rtt min/avg/max/mdev = ", l[-1])
         
         os.remove("app1_out.txt")
         

diff --git a/test/resources/omf/omf6_vlc_wrong_non_critical.py b/test/resources/omf/omf6_vlc_wrong_non_critical.py
index c0b9f5d..77f4441 100755 (executable)
--- a/test/resources/omf/omf6_vlc_wrong_non_critical.py
+++ b/test/resources/omf/omf6_vlc_wrong_non_critical.py
@@ -387,7 +387,7 @@ class OMFVLCWrongCaseWithNonCriticalDep(unittest.TestCase):
         self.ec.wait_finished([self.app1, self.app2, self.app3])
 
         self.assertEqual(self.ec.get_resource(self.app2).state, ResourceState.FAILED)
-        #self.assertEquals(self.ec.get_resource(self.app3).state, ResourceState.STOPPED)
+        #self.assertEqual(self.ec.get_resource(self.app3).state, ResourceState.STOPPED)
 
         self.ec.shutdown()
 
@@ -463,11 +463,11 @@ class OMFVLCWrongCaseWithNonCriticalDep(unittest.TestCase):
 
         self.ec.wait_finished([self.app1, self.app2, self.app3, self.app4, self.app5, self.app6])
 
-        #self.assertEquals(self.ec.get_resource(self.app3).state, ResourceState.STOPPED)
+        #self.assertEqual(self.ec.get_resource(self.app3).state, ResourceState.STOPPED)
         self.assertEqual(self.ec.get_resource(self.app2).state, ResourceState.FAILED)
-        #self.assertEquals(self.ec.get_resource(self.app4).state, ResourceState.STOPPED)
+        #self.assertEqual(self.ec.get_resource(self.app4).state, ResourceState.STOPPED)
         self.assertEqual(self.ec.get_resource(self.app5).state, ResourceState.FAILED)
-        #self.assertEquals(self.ec.get_resource(self.app6).state, ResourceState.STOPPED)
+        #self.assertEqual(self.ec.get_resource(self.app6).state, ResourceState.STOPPED)
 
         self.ec.shutdown()