X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=test%2Fresources%2Flinux%2Fns3%2Fns3simulation.py;h=f00dcadee31fb9ac9be2d23d75dbe2540e01d116;hb=1d2350d56f314a6e3de43517a66f7e2f48128d44;hp=1b3b7cb20d656c250a72ec156e95e33bf3d712ae;hpb=e55924b6886bd7382a28e1ae235c4810f852e163;p=nepi.git diff --git a/test/resources/linux/ns3/ns3simulation.py b/test/resources/linux/ns3/ns3simulation.py index 1b3b7cb2..f00dcade 100755 --- a/test/resources/linux/ns3/ns3simulation.py +++ b/test/resources/linux/ns3/ns3simulation.py @@ -17,6 +17,8 @@ # # Author: Alina Quereilhac +from __future__ import print_function + from nepi.execution.ec import ExperimentController from nepi.execution.trace import TraceAttr @@ -472,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() @@ -744,7 +746,7 @@ class LinuxNS3SimulationTest(unittest.TestCase): stdout = ec.trace(simu, "stdout") - print stdout + print(stdout) expected = "20 packets transmitted, 20 received, 0% packet loss" self.assertTrue(stdout.find(expected) > -1)