Correcting stdout issue with tests

Author: bridadan

azure-pipelines.yml

@@ -112,4 +112,4 @@ jobs:
                     architecture: x64
             -
                 script: 'python setup.py sdist'
-                displayName: 'Build sdist'
+                displayName: 'Build sdist'

packages/mbed-greentea/test/mbed_gt_cli.py

@@ -74,9 +74,10 @@ def test_get_greentea_version(self):
     def test_print_version(self):
         version = mbed_greentea_cli.get_greentea_version()
 
+        old_stdout = sys.stdout
         sys.stdout = stdout_capture = six.StringIO()
         mbed_greentea_cli.print_version()
-        sys.stdout = sys.__stdout__
+        sys.stdout = old_stdout
 
         printed_version = stdout_capture.getvalue().splitlines()[0]
         self.assertEqual(printed_version, version)

packages/mbed-greentea/test/mbed_gt_cmake_handlers.py

@@ -100,9 +100,10 @@ def test_list_binaries_for_targets(self):
         full_path = os.path.join(root_path, "resources")
 
         def run_and_capture(path, verbose=False):
+            old_stdout = sys.stdout
             sys.stdout = stdout_capture = six.StringIO()
             cmake_handlers.list_binaries_for_targets(build_dir=path, verbose_footer=verbose)
-            sys.stdout = sys.__stdout__
+            sys.stdout = old_stdout
 
             return stdout_capture.getvalue()
 
@@ -128,9 +129,10 @@ def test_list_binaries_for_builds(self):
 
         for verbose in [True, False]:
             # Capture logging output
+            old_stdout = sys.stdout
             sys.stdout = stdout_capture = six.StringIO()
             cmake_handlers.list_binaries_for_builds(spec, verbose_footer=verbose)
-            sys.stdout = sys.__stdout__
+            sys.stdout = old_stdout
 
             output = stdout_capture.getvalue()
             self.assertTrue("available tests for build 'K64F-ARM'" in output)

packages/mbed-greentea/test/mbed_gt_report_api.py

@@ -105,9 +105,10 @@ def test_export_to_file(self):
         payload  = "PAYLOAD"
         filepath = "."
 
+        old_stdout = sys.stdout
         sys.stdout = stdout_capture = six.StringIO()
         result = mbed_report_api.export_to_file(filepath, payload)
-        sys.stdout = sys.__stdout__
+        sys.stdout = old_stdout
 
         command_output = stdout_capture.getvalue().splitlines()[0]
         self.assertIn("file failed:", command_output)

test/test/mbed_gt_cmake_handlers.py

@@ -98,9 +98,10 @@ def test_list_binaries_for_targets(self):
         full_path = os.path.join(root_path, "resources")
 
         def run_and_capture(path, verbose=False):
+            old_stdout = sys.stdout
             sys.stdout = stdout_capture = six.StringIO()
             cmake_handlers.list_binaries_for_targets(build_dir=path, verbose_footer=verbose)
-            sys.stdout = sys.__stdout__
+            sys.stdout = old_stdout
 
             return stdout_capture.getvalue()
 
@@ -126,9 +127,10 @@ def test_list_binaries_for_builds(self):
 
         for verbose in [True, False]:
             # Capture logging output
+            old_stdout = sys.stdout
             sys.stdout = stdout_capture = six.StringIO()
             cmake_handlers.list_binaries_for_builds(spec, verbose_footer=verbose)
-            sys.stdout = sys.__stdout__
+            sys.stdout = old_stdout
 
             output = stdout_capture.getvalue()
             self.assertTrue("available tests for build 'K64F-ARM'" in output)

test/test/mbed_gt_report_api.py

@@ -106,9 +106,10 @@ def test_export_to_file(self):
         payload  = "PAYLOAD"
         filepath = "."
 
+        old_stdout = sys.stdout
         sys.stdout = stdout_capture = six.StringIO()
         result = mbed_report_api.export_to_file(filepath, payload)
-        sys.stdout = sys.__stdout__
+        sys.stdout = old_stdout
 
         command_output = stdout_capture.getvalue().splitlines()[0]
         self.assertIn("file failed:", command_output)