summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorCédric Ollivier <cedric.ollivier@orange.com>2016-08-22 13:40:34 +0200
committerCédric Ollivier <cedric.ollivier@orange.com>2016-08-22 14:03:15 +0200
commit2a8caf0838fe1bbb8d6527a4ec388fa06e24494d (patch)
tree4c132f616c654ebe960fc5298ef9a20aed02f9ca
parent0a40f5ecc5b2362e8b4dc2ec054daf611ac7f77e (diff)
Avoid opening tmp files twice
It avoids opening stdout.txt twice and removes it at the end. Change-Id: I7e006b52f49dd32543676259e0a1be2473670487 Signed-off-by: Cédric Ollivier <cedric.ollivier@orange.com>
-rwxr-xr-xtestcases/Controllers/ODL/OpenDaylightTesting.py8
1 files changed, 6 insertions, 2 deletions
diff --git a/testcases/Controllers/ODL/OpenDaylightTesting.py b/testcases/Controllers/ODL/OpenDaylightTesting.py
index 2075d13a8..184cacf81 100755
--- a/testcases/Controllers/ODL/OpenDaylightTesting.py
+++ b/testcases/Controllers/ODL/OpenDaylightTesting.py
@@ -104,15 +104,19 @@ class ODLTestCases:
except OSError:
pass
stdout_file = cls.res_dir + 'stdout.txt'
- with open(stdout_file, 'w') as stdout:
+ with open(stdout_file, 'w+') as stdout:
run(*dirs, variable=variables,
output=cls.res_dir + 'output.xml',
log='NONE',
report='NONE',
stdout=stdout)
- with open(stdout_file, 'r') as stdout:
+ stdout.seek(0, 0)
cls.logger.info("\n" + stdout.read())
cls.logger.info("ODL results was sucessfully generated")
+ try:
+ os.remove(stdout_file)
+ except OSError:
+ pass
return True
else:
return False