NuKVM/virt-manager
3
0
Fork 0
mirror of https://github.com/virt-manager/virt-manager.git synced 2025-02-25 18:55:27 -06:00
Code Issues Packages Projects Releases Wiki Activity

cli: Add helper for checking if we are in the test suite

Browse Source
This commit is contained in:
Cole Robinson 2016-07-20 09:31:28 -04:00
parent 322d212516
commit d70fccd296
1 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
virtinst/cli.py
View File

@ -182,7 +182,7 @@ def setupLogging(appname, debug_stdout, do_quiet, cli_app=True):
vi_dir = None vi_dir = None
logfile = None logfile = None
if "VIRTINST_TEST_SUITE" not in os.environ: if not _in_testsuite():
vi_dir = util.get_cache_dir() vi_dir = util.get_cache_dir()
logfile = os.path.join(vi_dir, appname + ".log") logfile = os.path.join(vi_dir, appname + ".log")
@ -258,6 +258,10 @@ def setupLogging(appname, debug_stdout, do_quiet, cli_app=True):
logging.debug("Launched with command line: %s", " ".join(sys.argv)) logging.debug("Launched with command line: %s", " ".join(sys.argv))
def _in_testsuite():
return "VIRTINST_TEST_SUITE" in os.environ
############################## ##############################
# Libvirt connection helpers # # Libvirt connection helpers #
############################## ##############################
@ -412,7 +416,7 @@ def validate_disk(dev, warn_overwrite=False):
def _run_console(guest, args): def _run_console(guest, args):
logging.debug("Running: %s", " ".join(args)) logging.debug("Running: %s", " ".join(args))
if "VIRTINST_TEST_SUITE" in os.environ: if _in_testsuite():
# Add this destroy() in here to trigger more virt-install code # Add this destroy() in here to trigger more virt-install code
# for the test suite # for the test suite
guest.domain.destroy() guest.domain.destroy()
@ -498,7 +502,7 @@ def get_console_cb(guest):
def get_meter(): def get_meter():
quiet = (get_global_state().quiet or "VIRTINST_TEST_SUITE" in os.environ) quiet = (get_global_state().quiet or _in_testsuite())
return util.make_meter(quiet=quiet) return util.make_meter(quiet=quiet)