x/deb-os-testr
Code Issues Proposed changes

Add --pdb flag and fix --no-discover flag

Browse Source 
This commit adds a --pdb flag which is similar to --no-discover except
that instead of running subunit.run test_id to bypass test discovery,
testtools.run test_id is used so that pdb traces set in the code are
useable. As part of this several fixes in the --no-discover path were
added since the codes is similar.
This commit is contained in:
Matthew Treinish 2015-03-17 16:42:27 -04:00
parent 898cd1eab5
commit 898dbbbda6
1 changed files with 11 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
os_testr/os_testr.py
View File

@ -45,6 +45,8 @@ def parse_args():
"discover and just excute the test specified") "discover and just excute the test specified")
parser.add_argument('--slowest', default=True, parser.add_argument('--slowest', default=True,
help="after the test run print the slowest tests") help="after the test run print the slowest tests")
parser.add_argument('--pdb',
help='Run a single test that has pdb traces added')
opts = parser.parse_args() opts = parser.parse_args()
return opts return opts
@ -99,10 +101,15 @@ def call_subunit_run(test_id, pretty):
ps.stdout.close() ps.stdout.close()
else: else:
proc = subprocess.Popen(cmd, env=env) proc = subprocess.Popen(cmd, env=env)
proc = subprocess.Popen(cmd)
return_code = proc.communicate()[0] return_code = proc.communicate()[0]
return return_code return return_code
def call_testtools_run(test_id):
cmd = ['python', '-m', 'testtools.run', test_id]
env = copy.deepcopy(os.environ)
proc = subprocess.Popen(cmd, env=env)
return_code = proc.communicate()[0]
return return_code
def main(): def main():
opts = parse_args() opts = parse_args()
@ -119,9 +126,11 @@ def main():
exclude_regex = construct_regex(opts.blacklist_file, opts.regex) exclude_regex = construct_regex(opts.blacklist_file, opts.regex)
if not os.path.isdir('.testrepository'): if not os.path.isdir('.testrepository'):
subprocess.call('testr init') subprocess.call('testr init')
if not opts.no_discover: if not opts.no_discover and not opts.pdb:
exit(call_testr(exclude_regex, opts.subunit, opts.pretty, opts.list, exit(call_testr(exclude_regex, opts.subunit, opts.pretty, opts.list,
opts.slowest)) opts.slowest))
elif opts.pdb:
exit(call_testtools_run(opts.pdb))
else: else:
exit(call_subunit_run(opts.no_discover, opts.pretty)) exit(call_subunit_run(opts.no_discover, opts.pretty))