Avoid opening tmp files twice 91/19191/2
authorCédric Ollivier <cedric.ollivier@orange.com>
Mon, 22 Aug 2016 11:40:34 +0000 (13:40 +0200)
committerCédric Ollivier <cedric.ollivier@orange.com>
Mon, 22 Aug 2016 12:03:15 +0000 (14:03 +0200)
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>
testcases/Controllers/ODL/OpenDaylightTesting.py

index 2075d13..184cacf 100755 (executable)
@@ -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