tests: Rename clistate -> TESTCONFIG

Makes it more clear it's a constant class, and its purpose

Signed-off-by: Cole Robinson <crobinso@redhat.com>

tests/__init__.py

@@ -32,7 +32,7 @@ def setup_logging():
     fmt = "%(levelname)-8s %(message)s"
     streamHandler = logging.StreamHandler()
     streamHandler.setFormatter(logging.Formatter(fmt))
-    if utils.clistate.debug:
+    if utils.TESTCONFIG.debug:
         streamHandler.setLevel(logging.DEBUG)
     else:
         streamHandler.setLevel(logging.ERROR)

tests/conftest.py

@@ -80,13 +80,13 @@ def pytest_collection_modifyitems(config, items):
 
 def pytest_configure(config):
     import tests
-    from tests.utils import clistate
+    from tests.utils import TESTCONFIG
 
-    clistate.url_iso_only = config.getoption("--urls-iso-only")
-    clistate.url_only = config.getoption("--urls-url-only")
-    clistate.url_skip_libosinfo = config.getoption("--urls-skip-libosinfo")
-    clistate.url_force_libosinfo = config.getoption("--urls-force-libosinfo")
-    clistate.regenerate_output = config.getoption("--regenerate-output")
+    TESTCONFIG.url_iso_only = config.getoption("--urls-iso-only")
+    TESTCONFIG.url_only = config.getoption("--urls-url-only")
+    TESTCONFIG.url_skip_libosinfo = config.getoption("--urls-skip-libosinfo")
+    TESTCONFIG.url_force_libosinfo = config.getoption("--urls-force-libosinfo")
+    TESTCONFIG.regenerate_output = config.getoption("--regenerate-output")
 
-    clistate.debug = config.getoption("--log-level") == "debug"
+    TESTCONFIG.debug = config.getoption("--log-level") == "debug"
     tests.setup_logging()

tests/test_cli.py

@@ -273,7 +273,7 @@ class Command(object):
 
         # Generate test files that don't exist yet
         filename = self.compare_file
-        if (utils.clistate.regenerate_output or
+        if (utils.TESTCONFIG.regenerate_output or
             not os.path.exists(filename)):
             open(filename, "w").write(output)
 

tests/test_urls.py

@@ -66,11 +66,11 @@ hvmguest.os.os_type = "hvm"
 xenguest = Guest(testconn)
 xenguest.os.os_type = "xen"
 
-meter = virtinst.progress.make_meter(quiet=not utils.clistate.debug)
+meter = virtinst.progress.make_meter(quiet=not utils.TESTCONFIG.debug)
 
-if utils.clistate.url_skip_libosinfo:
+if utils.TESTCONFIG.url_skip_libosinfo:
     os.environ["VIRTINST_TEST_SUITE_FORCE_LIBOSINFO"] = "0"
-elif utils.clistate.url_force_libosinfo:
+elif utils.TESTCONFIG.url_force_libosinfo:
     os.environ["VIRTINST_TEST_SUITE_FORCE_LIBOSINFO"] = "1"
 
 
@@ -84,12 +84,12 @@ def _skipmsg(testdata):
     is_iso = testdata.url.lower().endswith(".iso")
     distname = testdata.name
 
-    if utils.clistate.url_iso_only and not is_iso:
+    if utils.TESTCONFIG.url_iso_only and not is_iso:
         return "skipping non-iso test"
-    elif utils.clistate.url_only and is_iso:
+    elif utils.TESTCONFIG.url_only and is_iso:
         return "skipping non-url test"
 
-    if not utils.clistate.url_force_libosinfo:
+    if not utils.TESTCONFIG.url_force_libosinfo:
         return
     if testdata.skip_libosinfo:
         return "force-libosinfo requested but test has skip_libosinfo set"

tests/uitests/utils.py

@@ -458,7 +458,7 @@ class VMMDogtailApp(object):
             window_name=None, xmleditor_enabled=False):
         extra_opts = extra_opts or []
 
-        if tests.utils.clistate.debug:
+        if tests.utils.TESTCONFIG.debug:
             stdout = sys.stdout
             stderr = sys.stderr
             extra_opts.append("--debug")

tests/utils.py

@@ -18,7 +18,7 @@ import virtinst.uri
 # pylint: disable=protected-access
 # Access to protected member, needed to unittest stuff
 
-class _CLIState(object):
+class _TestConfig(object):
     """
     Class containing any bits passed in from setup.py
     """
@@ -32,7 +32,7 @@ class _CLIState(object):
         self.url_force_libosinfo = False
 
 
-clistate = _CLIState()
+TESTCONFIG = _TestConfig()
 
 
 def has_old_osinfo():
@@ -212,7 +212,7 @@ def test_create(testconn, xml, define_func="defineXML"):
 def diff_compare(actual_out, filename=None, expect_out=None):
     """Compare passed string output to contents of filename"""
     if not expect_out:
-        if not os.path.exists(filename) or clistate.regenerate_output:
+        if not os.path.exists(filename) or TESTCONFIG.regenerate_output:
             open(filename, "w").write(actual_out)
         expect_out = open(filename).read()