Correct bash execution call

pywbem · Jul 16, 2017 · 99d2d89 · 99d2d89
1 parent 6d74173
commit 99d2d89
Showing 1 changed file with 11 additions and 9 deletions.
diff --git a/testsuite/test_wbemcli.py b/testsuite/test_wbemcli.py
@@ -113,18 +113,20 @@ def test(self):  # pylint: disable=missing-docstring
                                                 'wbemcli_quit_script.py')
                 term_script_param = '-s %s' % term_script_file
 
-                command = ('wbemcli http://blah %s %s' %
-                           (test_params.cmd, term_script_param))
+                cmd = ('wbemcli http://blah %s %s' % (test_params.cmd,
+                                                      term_script_param))
                 # Disable python warnings for wbemcli call
                 # because some imports generate deprecated warnings
                 # that appear in std_err when nothing expected
-                if os.name == 'nt':
-                    pywarn = 'set PYTHONWARNINGS= &'
-                else:
-                    pywarn = 'export PYTHONWARNINGS= "" &&'
+                # if os.name == 'nt':
+                #    pywarn = 'set PYTHONWARNINGS= &'
+                # else:
+                #    pywarn = 'export PYTHONWARNINGS= "" &&'
+
+                # command = 'PYTHONWARNINGS="" && %s' % command
+                bash_cmd = 'bash -c "set -o pipefail; PYTHONWARNINGS= %s"' % cmd
 
-                command = '%s %s' % (pywarn, command)
-                proc = Popen(command, shell=True, stdout=PIPE, stderr=PIPE)
+                proc = Popen(bash_cmd, shell=True, stdout=PIPE, stderr=PIPE)
                 std_out, std_err = proc.communicate()
                 exitcode = proc.returncode
                 print('exitcode %s std_out:\n%s\nstd_err:\n%s' % (exitcode,
@@ -140,7 +142,7 @@ def test(self):  # pylint: disable=missing-docstring
                                       'Expected %s: cmd="%s": '
                                       'exitcode %s: stderr=%s' %
                                       (test_name, test_params.expected_exitcode,
-                                       command,
+                                       cmd,
                                        exitcode, std_err)))
 
                 if test_params.expected_stderr is None: