From b94fc6f9f6d44ac3c692191fb6037e528d4a424c Mon Sep 17 00:00:00 2001 From: Alina Quereilhac Date: Fri, 1 Aug 2014 19:33:22 +0200 Subject: [PATCH] Improvements to test/resources/linux/ns3/serialization.py --- test/resources/linux/ns3/serialization.py | 20 ++++++++------------ 1 file changed, 8 insertions(+), 12 deletions(-) diff --git a/test/resources/linux/ns3/serialization.py b/test/resources/linux/ns3/serialization.py index fb6d352a..fbf665f6 100755 --- a/test/resources/linux/ns3/serialization.py +++ b/test/resources/linux/ns3/serialization.py @@ -374,8 +374,6 @@ class LinuxNS3SimulationSerializationTest(unittest.TestCase): simu = ec.register_resource("LinuxNS3Simulation") ec.set(simu, "verbose", True) - #ec.set(simu, "buildMode", "debug") - #ec.set(simu, "nsLog", "DceApplication") ec.register_connection(simu, node) nsnode1 = add_ns3_node(ec, simu) @@ -411,12 +409,15 @@ class LinuxNS3SimulationSerializationTest(unittest.TestCase): ec.register_connection(udp_perf_client, nsnode2) filepath = ec.save(dirpath) - print filepath ec.deploy() ec.wait_finished([udp_perf_client]) + # Give time to flush the streams + import time + time.sleep(5) + expected = "udp-perf --duration=10 --nodes=2" cmdline = ec.trace(udp_perf, "cmdline") self.assertTrue(cmdline.find(expected) > -1, cmdline) @@ -429,10 +430,6 @@ class LinuxNS3SimulationSerializationTest(unittest.TestCase): stdout = ec.trace(udp_perf, "stdout") self.assertTrue(stdout.find(expected) > -1, stdout) - stderr = ec.trace(simu, "stderr") - expected = "DceApplication:StartApplication" - self.assertTrue(stderr.find(expected) > -1, stderr) - ec.shutdown() # Load serialized experiment @@ -440,7 +437,10 @@ class LinuxNS3SimulationSerializationTest(unittest.TestCase): ec2.deploy() ec2.wait_finished([udp_perf_client]) - + + # Give time to flush the streams + time.sleep(5) + self.assertEquals(len(ec.resources), len(ec2.resources)) expected = "udp-perf --duration=10 --nodes=2" @@ -455,10 +455,6 @@ class LinuxNS3SimulationSerializationTest(unittest.TestCase): stdout = ec2.trace(udp_perf, "stdout") self.assertTrue(stdout.find(expected) > -1, stdout) - stderr = ec2.trace(simu, "stderr") - expected = "DceApplication:StartApplication" - self.assertTrue(stderr.find(expected) > -1, stderr) - ec2.shutdown() shutil.rmtree(dirpath) -- 2.43.0