Correct bash execution call for windows so that test_wbemcli.py

executes correctly in both windows and linux.
Change test_logging.py to use the LogCapture package instead of trying
to work with log files. Eliminates problem with windows and
deleting log files.

Correct slashes on test_wbemcli.py file name for windows back to
linux slashes. They are created on windows but we are executing the
script in cygwin.

pywbem/_logging.py

@@ -280,9 +280,9 @@ def create_logger(cls, log_component, log_dest='stderr',
             # create named logger
             if handler:
                 handler.setFormatter(logging.Formatter(format_string))
-                logger_ops = logging.getLogger(logger_name)
-                logger_ops.addHandler(handler)
-                logger_ops.setLevel(level)
+                logger = logging.getLogger(logger_name)
+                logger.addHandler(handler)
+                logger.setLevel(level)
 
             # save the detail level in the dict that is part of this class.
             # All members of this tuple are just viewing except detail

setup.py

@@ -365,6 +365,7 @@ def run(self):
             "coverage>=4.3",
             "pytest>=2.4",
             "pytest-cov",
+            'testfixtures>=4.13.3',
             "Sphinx>=1.3" if sys.version_info[0:2] != (2, 6) else None,
             # Pinning GitPython to 2.0.8 max, due to its use of unittest.case
             # which is not available on Python 2.6.

testsuite/test_logging.py

@@ -28,6 +28,7 @@
 # pylint: disable=invalid-name,missing-docstring,too-many-statements
 # pylint: disable=too-many-lines,no-self-use
 import unittest
+from testfixtures import LogCapture, log_capture
 
 from pywbem import PywbemLoggers, LOG_OPS_CALLS_NAME
 from pywbem._logging import get_logger
@@ -43,21 +44,12 @@
 
 class BaseLoggingTests(unittest.TestCase):
     """Base class for logging unit tests"""
+
     def setUp(self):
         PywbemLoggers.reset()
-        if os.path.isfile(TEST_OUTPUT_LOG):
-            os.remove(TEST_OUTPUT_LOG)
 
     def tearDown(self):
-        if os.path.isfile(TEST_OUTPUT_LOG):
-            os.remove(TEST_OUTPUT_LOG)
-
-    def loadLogfile(self):
-        if os.path.isfile(TEST_OUTPUT_LOG):
-            with open(TEST_OUTPUT_LOG) as f:
-                lines = f.read().splitlines()
-                return lines
-        return None
+        LogCapture.uninstall_all()
 
 
 class TestLogParse(BaseLoggingTests):
@@ -171,7 +163,9 @@ def test_create_single_logger2(self):
         expected_result = \
             {'pywbem.http': ('min', 'debug', 'file', TEST_OUTPUT_LOG)}
 
-        self.assertEqual(PywbemLoggers.loggers, expected_result)
+        self.assertEqual(PywbemLoggers.loggers, expected_result,
+                         'Actual %s, Expected %s' % (PywbemLoggers.loggers,
+                                                     expected_result))
 
     def test_create_single_logger3(self):
         """
@@ -187,7 +181,9 @@ def test_create_single_logger3(self):
         expected_result = \
             {'pywbem.http': ('min', 'debug', 'stderr', None)}
 
-        self.assertEqual(PywbemLoggers.loggers, expected_result)
+        self.assertEqual(PywbemLoggers.loggers, expected_result,
+                         'Actual %s, Expected %s' % (PywbemLoggers.loggers,
+                                                     expected_result))
 
     def test_create_single_logger4(self):
         """
@@ -335,7 +331,8 @@ def test_create_loggers2(self):
 class TestLoggerOutput(BaseLoggingTests):
     """Test output from logging"""
 
-    def test_log_output(self):
+    @log_capture()
+    def test_log_output(self, l):
         test_input = 'all=file:all:debug'
 
         print('log filename %s' % TEST_OUTPUT_LOG)
@@ -359,8 +356,8 @@ def test_log_output(self):
 
         my_logger.debug('%s: %s: %s', return_name, 'FakeMethodName', result)
 
-        logged_data = self.loadLogfile()
-        print('Log file contents:\n%s' % logged_data)
+        l.check(('pywbem.ops', 'DEBUG',
+                 "Return: FakeMethodName: 'This is fake return data'"))
 
 
 if __name__ == '__main__':

testsuite/test_wbemcli.py

@@ -111,25 +111,27 @@ def test(self):  # pylint: disable=missing-docstring
                 """ The test method that is generated."""
                 term_script_file = os.path.join(SCRIPT_DIR,
                                                 'wbemcli_quit_script.py')
+
+                term_script_file = term_script_file.replace('\\', '/')
                 term_script_param = '-s %s' % term_script_file
 
-                command = ('wbemcli http://blah %s %s' %
-                           (test_params.cmd, term_script_param))
+                scr_name = 'wbemcli.bat' if os.name == 'nt' else 'wbemcli'
+
+                cmd = ('%s http://blah %s %s' % (scr_name, 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= "" &&'
 
-                command = '%s %s' % (pywarn, command)
-                proc = Popen(command, shell=True, stdout=PIPE, stderr=PIPE)
+                bash_cmd = 'bash -c "set -o pipefail;  PYTHONPATH=. ' \
+                           'PYTHONWARNINGS= %s"' % cmd
+
+                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,
-                                                                  std_out,
-                                                                  std_err))
+                # print('bash_cmd: %s\nexitcode: %s std_out:\n%s\nstd_err:'
+                #      '\n%s' % (bash_cmd, exitcode, std_out, std_err))
+
                 if six.PY3:
                     std_out = std_out.decode()
                     std_err = std_err.decode()
@@ -140,12 +142,10 @@ 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:
-                    print('searchresult %s' % re.search('ImportWarning',
-                                                        std_err))
                     if re.search('ImportWarning', std_err) is None:
                         self.assertEqual(std_err, "",
                                          'Test %s stderr not empty as '