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
Sometimes when controller process cleanup happens concurrently with testbed teardown...
[nepi.git]
/
test
/
testbeds
/
ns3
/
execute2.py
diff --git
a/test/testbeds/ns3/execute2.py
b/test/testbeds/ns3/execute2.py
index
1a24e70
..
52ac526
100755
(executable)
--- a/
test/testbeds/ns3/execute2.py
+++ b/
test/testbeds/ns3/execute2.py
@@
-114,7
+114,12
@@
class Ns3ExecuteTestCase(unittest.TestCase):
instance.shutdown()
def tearDown(self):
instance.shutdown()
def tearDown(self):
- shutil.rmtree(self.root_dir)
+ try:
+ shutil.rmtree(self.root_dir)
+ except:
+ # retry
+ time.sleep(0.1)
+ shutil.rmtree(self.root_dir)
if __name__ == '__main__':
unittest.main()
if __name__ == '__main__':
unittest.main()