Merging with head

[nepi.git] / test / testbeds / ns3 / execute2.py

diff --git a/test/testbeds/ns3/execute2.py b/test/testbeds/ns3/execute2.py
index 52ac526..3072097 100755 (executable)
--- a/test/testbeds/ns3/execute2.py
+++ b/test/testbeds/ns3/execute2.py
@@ -23,7 +23,7 @@ class Ns3ExecuteTestCase(unittest.TestCase):
     @test_util.skipUnless(test_util.ns3_usable(),
             "Test requires working ns-3 bindings")
     def test_run_ping_routing(self):
-        testbed_version = "3_9_RC3"
+        testbed_version = "3_9"
         instance = ns3.TestbedController(testbed_version)
         instance.defer_configure("homeDirectory", self.root_dir)
         instance.defer_create(2, "ns3::Node")
@@ -104,6 +104,7 @@ class Ns3ExecuteTestCase(unittest.TestCase):
         instance.do_connect_compl()
         instance.do_preconfigure()
         instance.do_configure()
+        instance.do_prestart()
         instance.start()
         while instance.status(27) != STATUS_FINISHED:
             time.sleep(0.1)