test: fix CLI tests

Author: mbdevpl

test/test_cli.py

@@ -0,0 +1,81 @@
+"""Tests of the CLI."""
+
+import contextlib
+import io
+import logging
+import runpy
+import sys
+import unittest
+
+from version_query.version import VersionComponent
+from version_query.query import \
+    query_caller, query_version_str, predict_caller, predict_version_str
+
+_LOG = logging.getLogger(__name__)
+
+
+@contextlib.contextmanager
+def temporarily_set_logger_level(logger_name: str, level: int):
+    """Change logger level on enter and restore on exit of this context."""
+    logger = logging.getLogger(logger_name)
+    level_ = logger.level
+    logger.setLevel(level)
+    try:
+        yield
+    finally:
+        logger.setLevel(level_)
+
+
+def preserve_logger_level(logger_name: str):
+    return temporarily_set_logger_level(logger_name, logging.getLogger(logger_name).level)
+
+
+def run_module(name: str, *args, run_name: str = '__main__') -> None:
+    backup_sys_argv = sys.argv
+    sys.argv = [name + '.py'] + list(args)
+    runpy.run_module(name, run_name=run_name, alter_sys=True)
+    sys.argv = backup_sys_argv
+
+
+class Tests(unittest.TestCase):
+
+    def test_not_as_main(self):  # pylint: disable = no-self-use
+        run_module('version_query', run_name='__not_main__')
+
+    def test_help(self):
+        sio = io.StringIO()
+        with contextlib.redirect_stderr(sio), preserve_logger_level('version_query'), \
+                self.assertRaises(SystemExit):
+            run_module('version_query')
+        _LOG.info('%s', sio.getvalue())
+
+    def test_bad_usage(self):
+        sio = io.StringIO()
+        with contextlib.redirect_stderr(sio), preserve_logger_level('version_query'), \
+                self.assertRaises(ValueError):
+            run_module('version_query', '-p', '-i', '.')
+        _LOG.info('%s', sio.getvalue())
+
+    def test_here(self):
+        sio = io.StringIO()
+        with temporarily_set_logger_level('version_query', logging.ERROR), \
+                contextlib.redirect_stdout(sio):
+            run_module('version_query', '.')
+        self.assertEqual(sio.getvalue().rstrip(), query_caller().to_str())
+        self.assertEqual(sio.getvalue().rstrip(), query_version_str())
+
+    def test_increment_here(self):
+        sio = io.StringIO()
+        with temporarily_set_logger_level('version_query', logging.ERROR), \
+                contextlib.redirect_stdout(sio):
+            run_module('version_query', '-i', '.')
+        self.assertEqual(sio.getvalue().rstrip(),
+                         query_caller().increment(VersionComponent.Patch).to_str())
+
+    def test_predict_here(self):
+        sio = io.StringIO()
+        with temporarily_set_logger_level('version_query', logging.ERROR), \
+                contextlib.redirect_stdout(sio):
+            run_module('version_query', '-p', '.')
+        self.assertEqual(sio.getvalue().rstrip(), predict_caller().to_str())
+        self.assertEqual(sio.getvalue().rstrip(), predict_version_str())

test/test_query.py

@@ -1,48 +1,29 @@
 """Tests of querying tools."""
 
-import contextlib
 import importlib
-import io
 import logging
 import os
 import pathlib
 import sys
 import tempfile
 import unittest
-import unittest.mock
 
 from boilerplates.packaging_tests import run_module
 
-from version_query.version import VersionComponent, Version
+from version_query.version import Version
 from version_query.git_query import query_git_repo, predict_git_repo
 from version_query.py_query import query_metadata_json, query_pkg_info, query_package_folder
-from version_query.query import \
-    query_folder, query_caller, query_version_str, predict_caller, predict_version_str
+from version_query.query import query_folder, query_caller
 from .examples import \
     PY_LIB_DIR, GIT_REPO_EXAMPLES, METADATA_JSON_EXAMPLE_PATHS, PKG_INFO_EXAMPLE_PATHS, \
     PACKAGE_FOLDER_EXAMPLES
+from .test_cli import preserve_logger_level
 
 _LOG = logging.getLogger(__name__)
 
 IGNORED_FOLDER_NAMES = ['opencv']
 
 
-@contextlib.contextmanager
-def temporarily_set_logger_level(logger_name: str, level: int):
-    """Change logger level on enter and restore on exit of this context."""
-    logger = logging.getLogger(logger_name)
-    level_ = logger.level
-    logger.setLevel(level)
-    try:
-        yield
-    finally:
-        logger.setLevel(level_)
-
-
-def preserve_logger_level(logger_name: str):
-    return temporarily_set_logger_level(logger_name, logging.getLogger(logger_name).level)
-
-
 class Tests(unittest.TestCase):
 
     def _check_examples_count(self, description, examples):
@@ -164,47 +145,3 @@ def test_query_caller(self):
         version = query_caller()
         _LOG.debug('caller: %s', version)
         self.assertIsInstance(version, Version)
-
-    def test_not_as_main(self):  # pylint: disable = no-self-use
-        run_module('version_query', run_name=None)
-
-    def test_help(self):
-        sio = io.StringIO()
-        with contextlib.redirect_stderr(sio):
-            with preserve_logger_level('version_query'):
-                with self.assertRaises(SystemExit):
-                    run_module('version_query')
-        _LOG.info('%s', sio.getvalue())
-
-    def test_bad_usage(self):
-        sio = io.StringIO()
-        with contextlib.redirect_stderr(sio):
-            with preserve_logger_level('version_query'):
-                with self.assertRaises(ValueError):
-                    run_module('version_query', '-p', '-i', '.')
-        _LOG.info('%s', sio.getvalue())
-
-    def test_here(self):
-        with temporarily_set_logger_level('version_query', logging.ERROR):
-            sio = io.StringIO()
-            with contextlib.redirect_stdout(sio):
-                run_module('version_query', '.')
-            self.assertEqual(sio.getvalue().rstrip(), query_caller().to_str())
-            self.assertEqual(sio.getvalue().rstrip(), query_version_str())
-
-    def test_increment_here(self):
-        with temporarily_set_logger_level('version_query', logging.ERROR):
-            sio = io.StringIO()
-            with contextlib.redirect_stdout(sio):
-                with preserve_logger_level('version_query'):
-                    run_module('version_query', '-i', '.')
-            self.assertEqual(sio.getvalue().rstrip(),
-                            query_caller().increment(VersionComponent.Patch).to_str())
-
-    def test_predict_here(self):
-        with temporarily_set_logger_level('version_query', logging.ERROR):
-            sio = io.StringIO()
-            with contextlib.redirect_stdout(sio):
-                run_module('version_query', '-p', '.')
-            self.assertEqual(sio.getvalue().rstrip(), predict_caller().to_str())
-            self.assertEqual(sio.getvalue().rstrip(), predict_version_str())