x/gantt
Code Issues Proposed changes

Merge "Actual fix for bug 931608."

Browse Source
This commit is contained in:
Jenkins
2012-02-23 18:11:41 +00:00
committed by Gerrit Code Review
parent 91647843f1 4424fd2d6e
commit da5a3cd38b
1 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
nova/testing/runner.py
View File

@@ -343,9 +343,10 @@ class NovaTestRunner(core.TextTestRunner):
def run(): def run():
flags.FLAGS.register_cli_opt(cfg.BoolOpt('hide-elapsed', default=False)) # This is a fix to allow the --hide-elapsed flag while accepting
flags.FLAGS.register_cli_opt(cfg.BoolOpt("stop", short='x', default=False)) # arbitrary nosetest flags as well
argv = flags.FLAGS(sys.argv) argv = [x for x in sys.argv if x != '--hide-elapsed']
hide_elapsed = argv != sys.argv
logging.setup() logging.setup()
# If any argument looks like a test name but doesn't have "nova.tests" in # If any argument looks like a test name but doesn't have "nova.tests" in
@@ -364,7 +365,7 @@ def run():
runner = NovaTestRunner(stream=c.stream, runner = NovaTestRunner(stream=c.stream,
verbosity=c.verbosity, verbosity=c.verbosity,
config=c, config=c,
show_elapsed=not flags.FLAGS.hide_elapsed) show_elapsed=not hide_elapsed)
sys.exit(not core.run(config=c, testRunner=runner, argv=argv)) sys.exit(not core.run(config=c, testRunner=runner, argv=argv))