a first very rough step towards python3

[nepi.git] / test / resources / linux / ns3 / ns3simulation.py

diff --git a/test/resources/linux/ns3/ns3simulation.py b/test/resources/linux/ns3/ns3simulation.py
index 5f7ce29..621bfb7 100755 (executable)
--- a/test/resources/linux/ns3/ns3simulation.py
+++ b/test/resources/linux/ns3/ns3simulation.py
@@ -17,7 +17,7 @@
 #
 # Author: Alina Quereilhac <alina.quereilhac@inria.fr>
 
-from __future__ import print_function
+
 
 from nepi.execution.ec import ExperimentController 
 from nepi.execution.trace import TraceAttr
@@ -474,16 +474,16 @@ class LinuxNS3SimulationTest(unittest.TestCase):
                 output = ec.trace(guid, trace)
 
                 size = ec.trace(guid, trace, attr = TraceAttr.SIZE)
-                self.assertEquals(size, len(output))
+                self.assertEqual(size, len(output))
                 self.assertTrue(size > 100)
                 
                 block = ec.trace(guid, trace, attr = TraceAttr.STREAM, block = 5, offset = 1)
-                self.assertEquals(block, output[5:10])
+                self.assertEqual(block, output[5:10])
 
                 trace_path = ec.trace(guid, trace, attr = TraceAttr.PATH)
                 rm = ec.get_resource(guid)
                 path = os.path.join(rm_simu.run_home, rm._trace_filename.get(trace))
-                self.assertEquals(trace_path, path)
+                self.assertEqual(trace_path, path)
 
         ec.shutdown()