def make_ns_in_pl(self, pl, exp, node1, iface1, root):
ns3_testbed_id = "ns3"
- ns3_testbed_version = "3_9_RC3"
+ ns3_testbed_version = "3_9"
# Add NS3 support in node1
plnepi = pl.create("NepiDependency")
"Test is expensive, requires NEPI_FULL_TESTS=yes")
def test_ns3_in_pl(self):
ns3_testbed_id = "ns3"
- ns3_testbed_version = "3_9_RC3"
+ ns3_testbed_version = "3_9"
pl, exp = self.make_experiment_desc()
xml = exp.to_xml()
- controller = ExperimentController(xml, self.root_dir)
- controller.start()
- # just test that it starts...
- controller.stop()
- controller.shutdown()
+ try:
+ controller = ExperimentController(xml, self.root_dir)
+ controller.start()
+ # just test that it starts...
+ finally:
+ controller.stop()
+ controller.shutdown()
@test_util.skipUnless(test_util.pl_auth() is not None,
"Test requires PlanetLab authentication info (PL_USER and PL_PASS environment variables)")
xml = exp.to_xml()
- controller = ExperimentController(xml, self.root_dir)
- controller.start()
+ try:
+ controller = ExperimentController(xml, self.root_dir)
+ controller.start()
- while not controller.is_finished(ping.guid):
- time.sleep(0.5)
-
- ping_result = controller.trace(ping.guid, "stdout")
- tap_trace = controller.trace(tap1.guid, "packets")
+ while not controller.is_finished(ping.guid):
+ time.sleep(0.5)
+
+ ping_result = controller.trace(ping.guid, "stdout")
+ tap_trace = controller.trace(tap1.guid, "packets")
- controller.stop()
- controller.shutdown()
+ finally:
+ controller.stop()
+ controller.shutdown()
# asserts at the end, to make sure there's proper cleanup
self.assertTrue(re.match(comp_result, ping_result, re.MULTILINE),
xml = exp.to_xml()
- controller = ExperimentController(xml, self.root_dir)
- controller.start()
+ try:
+ controller = ExperimentController(xml, self.root_dir)
+ controller.start()
- while not controller.is_finished(ping.guid):
- time.sleep(0.5)
-
- tap_trace = controller.trace(tap1.guid, "packets")
+ while not controller.is_finished(ping.guid):
+ time.sleep(0.5)
+
+ tap_trace = controller.trace(tap1.guid, "packets")
- controller.stop()
- controller.shutdown()
+ finally:
+ controller.stop()
+ controller.shutdown()
# asserts at the end, to make sure there's proper cleanup
sent = 0