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

cli: Don't log to debug files from the test suite

Browse Source 
We shouldn't be doing it anyways, but my recent cache_dir change broke
a bunch of stuff without this.
This commit is contained in:
Cole Robinson 2013-10-01 10:12:56 -04:00
parent 0b58badfc1
commit dd823d2d8c
2 changed files with 13 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
tests/utils.py
View File

@ -43,6 +43,7 @@ urikvm = uriqemu + _capsprefix + "libvirt-1.1.2-qemu-caps.xml"
urilxc = fakeuri + _capsprefix + "capabilities-lxc.xml,lxc"
os.environ["VIRTINST_TEST_SCRATCHDIR"] = os.getcwd()
os.environ["VIRTINST_TEST_SUITE"] = "1"
def get_debug():

20
virtinst/cli.py
View File

@ -147,8 +147,11 @@ def setupLogging(appname, debug_stdout, do_quiet, cli_app=True):
global quiet
quiet = do_quiet
vi_dir = util.get_cache_dir()
if not os.access(vi_dir, os.W_OK):
vi_dir = None
if not "VIRTINST_TEST_SUITE" in os.environ:
vi_dir = util.get_cache_dir()
if vi_dir and not os.access(vi_dir, os.W_OK):
if os.path.exists(vi_dir):
raise RuntimeError("No write access to directory %s" % vi_dir)
@ -163,7 +166,6 @@ def setupLogging(appname, debug_stdout, do_quiet, cli_app=True):
fileFormat = ("[%(asctime)s " + appname + " %(process)d] "
"%(levelname)s (%(module)s:%(lineno)d) %(message)s")
streamErrorFormat = "%(levelname)-8s %(message)s"
filename = os.path.join(vi_dir, appname + ".log")
rootLogger = logging.getLogger()
@ -172,11 +174,13 @@ def setupLogging(appname, debug_stdout, do_quiet, cli_app=True):
rootLogger.removeHandler(handler)
rootLogger.setLevel(logging.DEBUG)
fileHandler = logging.handlers.RotatingFileHandler(filename, "ae",
1024 * 1024, 5)
fileHandler.setFormatter(logging.Formatter(fileFormat,
dateFormat))
rootLogger.addHandler(fileHandler)
if vi_dir:
filename = os.path.join(vi_dir, appname + ".log")
fileHandler = logging.handlers.RotatingFileHandler(filename, "ae",
1024 * 1024, 5)
fileHandler.setFormatter(logging.Formatter(fileFormat,
dateFormat))
rootLogger.addHandler(fileHandler)
streamHandler = VirtStreamHandler(sys.stderr)
if debug_stdout: