git://git.onelab.eu
/
nepi.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fixing ns-3 DCE tests
[nepi.git]
/
src
/
nepi
/
resources
/
linux
/
ns3
/
ns3simulation.py
diff --git
a/src/nepi/resources/linux/ns3/ns3simulation.py
b/src/nepi/resources/linux/ns3/ns3simulation.py
index
cfef32c
..
28a4e10
100644
(file)
--- a/
src/nepi/resources/linux/ns3/ns3simulation.py
+++ b/
src/nepi/resources/linux/ns3/ns3simulation.py
@@
-311,10
+311,10
@@
class LinuxNS3Simulation(LinuxApplication, NS3Simulation):
self._client.start()
"""
self._client.start()
"""
- # XXX: IS THIS REALLY NEEDED??!!!
- # Wait until the Simulation is actually started
...
+ XXX: Is this necessary??
+ # Wait until the Simulation is actually started
before setting the state
is_running = False
is_running = False
- for i in xrange(
10
00):
+ for i in xrange(
2
00):
is_running = self.invoke(SIMULATOR_UUID, "isRunning")
is_finished = self.invoke(SIMULATOR_UUID, "isFinished")
is_running = self.invoke(SIMULATOR_UUID, "isRunning")
is_finished = self.invoke(SIMULATOR_UUID, "isFinished")
@@
-328,6
+328,7
@@
class LinuxNS3Simulation(LinuxApplication, NS3Simulation):
self.error(msg)
raise RuntimeError
"""
self.error(msg)
raise RuntimeError
"""
+
self.set_started()
else:
msg = " Failed to execute command '%s'" % command
self.set_started()
else:
msg = " Failed to execute command '%s'" % command