particle-os/debian-koji
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

cli: show log urls for failed tasks

Browse source 
Fixes: https://pagure.io/koji/issue/2188
This commit is contained in:
Tomas Kopecek 2020-09-22 09:45:15 +02:00 • committed by Mike McLean
parent 30e87348b8
commit bc478c2d68
17 changed files with 86 additions and 59 deletions
Download patch file Download diff file Expand all files Collapse all files

36
cli/koji_cli/commands.py
View file

@ -537,7 +537,7 @@ def handle_build(options, session, args):
if build_opts.wait or (build_opts.wait is None and not _running_in_bg()): if build_opts.wait or (build_opts.wait is None and not _running_in_bg()):
session.logout() session.logout()
return watch_tasks(session, [task_id], quiet=build_opts.quiet, return watch_tasks(session, [task_id], quiet=build_opts.quiet,
poll_interval=options.poll_interval) poll_interval=options.poll_interval, topurl=options.topurl)
def handle_chain_build(options, session, args): def handle_chain_build(options, session, args):
@ -612,7 +612,7 @@ def handle_chain_build(options, session, args):
else: else:
session.logout() session.logout()
return watch_tasks(session, [task_id], quiet=build_opts.quiet, return watch_tasks(session, [task_id], quiet=build_opts.quiet,
poll_interval=options.poll_interval) poll_interval=options.poll_interval, topurl=options.topurl)
def handle_maven_build(options, session, args): def handle_maven_build(options, session, args):
@ -713,7 +713,7 @@ def handle_maven_build(options, session, args):
else: else:
session.logout() session.logout()
return watch_tasks(session, [task_id], quiet=build_opts.quiet, return watch_tasks(session, [task_id], quiet=build_opts.quiet,
poll_interval=options.poll_interval) poll_interval=options.poll_interval, topurl=options.topurl)
def handle_wrapper_rpm(options, session, args): def handle_wrapper_rpm(options, session, args):
@ -785,7 +785,7 @@ def handle_wrapper_rpm(options, session, args):
else: else:
session.logout() session.logout()
return watch_tasks(session, [task_id], quiet=options.quiet, return watch_tasks(session, [task_id], quiet=options.quiet,
poll_interval=options.poll_interval) poll_interval=options.poll_interval, topurl=options.topurl)
def handle_maven_chain(options, session, args): def handle_maven_chain(options, session, args):
@ -837,7 +837,7 @@ def handle_maven_chain(options, session, args):
else: else:
session.logout() session.logout()
return watch_tasks(session, [task_id], quiet=options.quiet, return watch_tasks(session, [task_id], quiet=options.quiet,
poll_interval=options.poll_interval) poll_interval=options.poll_interval, topurl=options.topurl)
def handle_resubmit(goptions, session, args): def handle_resubmit(goptions, session, args):
@ -865,7 +865,7 @@ def handle_resubmit(goptions, session, args):
else: else:
session.logout() session.logout()
return watch_tasks(session, [newID], quiet=options.quiet, return watch_tasks(session, [newID], quiet=options.quiet,
poll_interval=goptions.poll_interval) poll_interval=goptions.poll_interval, topurl=goptions.topurl)
def handle_call(goptions, session, args): def handle_call(goptions, session, args):
@ -1152,7 +1152,7 @@ def handle_restart_hosts(options, session, args):
if my_opts.wait or (my_opts.wait is None and not _running_in_bg()): if my_opts.wait or (my_opts.wait is None and not _running_in_bg()):
session.logout() session.logout()
return watch_tasks(session, [task_id], quiet=my_opts.quiet, return watch_tasks(session, [task_id], quiet=my_opts.quiet,
poll_interval=options.poll_interval) poll_interval=options.poll_interval, topurl=options.topurl)
def handle_import(goptions, session, args): def handle_import(goptions, session, args):
@ -5889,7 +5889,7 @@ def _build_image_indirection(options, task_opts, session, args):
print("Task info: %s/taskinfo?taskID=%s" % (options.weburl, task_id)) print("Task info: %s/taskinfo?taskID=%s" % (options.weburl, task_id))
if task_opts.wait or (task_opts.wait is None and not _running_in_bg()): if task_opts.wait or (task_opts.wait is None and not _running_in_bg()):
session.logout() session.logout()
return watch_tasks(session, [task_id], quiet=options.quiet) return watch_tasks(session, [task_id], quiet=options.quiet, topurl=options.topurl)
def handle_image_build(options, session, args): def handle_image_build(options, session, args):
@ -6085,7 +6085,7 @@ def _build_image(options, task_opts, session, args, img_type):
if task_opts.wait or (task_opts.wait is None and not _running_in_bg()): if task_opts.wait or (task_opts.wait is None and not _running_in_bg()):
session.logout() session.logout()
return watch_tasks(session, [task_id], quiet=options.quiet, return watch_tasks(session, [task_id], quiet=options.quiet,
poll_interval=options.poll_interval) poll_interval=options.poll_interval, topurl=options.topurl)
def _build_image_oz(options, task_opts, session, args): def _build_image_oz(options, task_opts, session, args):
@ -6154,7 +6154,7 @@ def _build_image_oz(options, task_opts, session, args):
if task_opts.wait or (task_opts.wait is None and not _running_in_bg()): if task_opts.wait or (task_opts.wait is None and not _running_in_bg()):
session.logout() session.logout()
return watch_tasks(session, [task_id], quiet=options.quiet, return watch_tasks(session, [task_id], quiet=options.quiet,
poll_interval=options.poll_interval) poll_interval=options.poll_interval, topurl=options.topurl)
def handle_win_build(options, session, args): def handle_win_build(options, session, args):
@ -6229,7 +6229,7 @@ def handle_win_build(options, session, args):
if build_opts.wait or (build_opts.wait is None and not _running_in_bg()): if build_opts.wait or (build_opts.wait is None and not _running_in_bg()):
session.logout() session.logout()
return watch_tasks(session, [task_id], quiet=build_opts.quiet, return watch_tasks(session, [task_id], quiet=build_opts.quiet,
poll_interval=options.poll_interval) poll_interval=options.poll_interval, topurl=options.topurl)
def handle_free_task(goptions, session, args): def handle_free_task(goptions, session, args):
@ -6476,7 +6476,7 @@ def anon_handle_watch_task(goptions, session, args):
parser.error(_("at least one task id must be specified")) parser.error(_("at least one task id must be specified"))
return watch_tasks(session, tasks, quiet=options.quiet, return watch_tasks(session, tasks, quiet=options.quiet,
poll_interval=goptions.poll_interval) poll_interval=goptions.poll_interval, topurl=goptions.topurl)
def anon_handle_watch_logs(goptions, session, args): def anon_handle_watch_logs(goptions, session, args):
@ -6540,7 +6540,7 @@ def handle_make_task(goptions, session, args):
else: else:
session.logout() session.logout()
return watch_tasks(session, [task_id], quiet=goptions.quiet, return watch_tasks(session, [task_id], quiet=goptions.quiet,
poll_interval=goptions.poll_interval) poll_interval=goptions.poll_interval, topurl=goptions.topurl)
def handle_tag_build(opts, session, args): def handle_tag_build(opts, session, args):
@ -6566,7 +6566,7 @@ def handle_tag_build(opts, session, args):
else: else:
session.logout() session.logout()
return watch_tasks(session, tasks, quiet=opts.quiet, return watch_tasks(session, tasks, quiet=opts.quiet,
poll_interval=opts.poll_interval) poll_interval=opts.poll_interval, topurl=opts.topurl)
def handle_move_build(opts, session, args): def handle_move_build(opts, session, args):
@ -6617,7 +6617,7 @@ def handle_move_build(opts, session, args):
else: else:
session.logout() session.logout()
return watch_tasks(session, tasks, quiet=opts.quiet, return watch_tasks(session, tasks, quiet=opts.quiet,
poll_interval=opts.poll_interval) poll_interval=opts.poll_interval, topurl=opts.topurl)
def handle_untag_build(goptions, session, args): def handle_untag_build(goptions, session, args):
@ -6981,7 +6981,7 @@ def anon_handle_download_task(options, session, args):
koji.TASK_STATES['CANCELED'], koji.TASK_STATES['CANCELED'],
koji.TASK_STATES['FAILED']): koji.TASK_STATES['FAILED']):
watch_tasks(session, [base_task_id], quiet=suboptions.quiet, watch_tasks(session, [base_task_id], quiet=suboptions.quiet,
poll_interval=options.poll_interval) poll_interval=options.poll_interval, topurl=options.topurl)
def check_downloadable(task): def check_downloadable(task):
return task["method"] == "buildArch" return task["method"] == "buildArch"
@ -7188,7 +7188,7 @@ def handle_regen_repo(options, session, args):
else: else:
session.logout() session.logout()
return watch_tasks(session, [task_id], quiet=options.quiet, return watch_tasks(session, [task_id], quiet=options.quiet,
poll_interval=options.poll_interval) poll_interval=options.poll_interval, topurl=options.topurl)
def handle_dist_repo(options, session, args): def handle_dist_repo(options, session, args):
@ -7327,7 +7327,7 @@ def handle_dist_repo(options, session, args):
else: else:
session.logout() session.logout()
return watch_tasks(session, [task_id], quiet=options.quiet, return watch_tasks(session, [task_id], quiet=options.quiet,
poll_interval=options.poll_interval) poll_interval=options.poll_interval, topurl=options.topurl)
_search_types = ('package', 'build', 'tag', 'target', 'user', 'host', 'rpm', _search_types = ('package', 'build', 'tag', 'target', 'user', 'host', 'rpm',

35
cli/koji_cli/lib.py
View file

@ -139,12 +139,13 @@ def print_task_recurse(task, depth=0):
class TaskWatcher(object): class TaskWatcher(object):
def __init__(self, task_id, session, level=0, quiet=False): def __init__(self, task_id, session, level=0, quiet=False, topurl=None):
self.id = task_id self.id = task_id
self.session = session self.session = session
self.info = None self.info = None
self.level = level self.level = level
self.quiet = quiet self.quiet = quiet
self.topurl = topurl
# XXX - a bunch of this stuff needs to adapt to different tasks # XXX - a bunch of this stuff needs to adapt to different tasks
@ -198,7 +199,7 @@ class TaskWatcher(object):
else: else:
# First time we're seeing this task, so just show the current state # First time we're seeing this task, so just show the current state
if not self.quiet: if not self.quiet:
print("%s: %s" % (self.str(), self.display_state(self.info))) print("%s: %s" % (self.str(), self.display_state(self.info, level=self.level)))
return False return False
def is_done(self): def is_done(self):
@ -213,7 +214,7 @@ class TaskWatcher(object):
state = koji.TASK_STATES[self.info['state']] state = koji.TASK_STATES[self.info['state']]
return (state == 'CLOSED') return (state == 'CLOSED')
def display_state(self, info): def display_state(self, info, level=0):
# We can sometimes be passed a task that is not yet open, but # We can sometimes be passed a task that is not yet open, but
# not finished either. info would be none. # not finished either. info would be none.
if not info: if not info:
@ -225,7 +226,25 @@ class TaskWatcher(object):
else: else:
return 'open' return 'open'
elif info['state'] == koji.TASK_STATES['FAILED']: elif info['state'] == koji.TASK_STATES['FAILED']:
return 'FAILED: %s' % self.get_failure() s = 'FAILED: %s' % self.get_failure()
if self.topurl:
# add relevant logs if there are any
output = list_task_output_all_volumes(self.session, self.id)
files = []
for filename, volumes in six.iteritems(output):
files += [(filename, volume) for volume in volumes]
files = [file_volume for file_volume in files if file_volume[0].endswith('log')]
pi = koji.PathInfo(topdir=self.topurl)
# indent more than current level
level += 1
logs = [' ' * level + os.path.join(pi.task(self.id, f[1]), f[0]) for f in files]
if logs:
s += '\n' + ' ' * level + 'Relevant logs:\n'
s += '\n'.join(logs)
return s
else: else:
return koji.TASK_STATES[info['state']].lower() return koji.TASK_STATES[info['state']].lower()
@ -264,7 +283,7 @@ def display_task_results(tasks):
print('%s has not completed' % task_label) print('%s has not completed' % task_label)
def watch_tasks(session, tasklist, quiet=False, poll_interval=60, ki_handler=None): def watch_tasks(session, tasklist, quiet=False, poll_interval=60, ki_handler=None, topurl=None):
if not tasklist: if not tasklist:
return return
if not quiet: if not quiet:
@ -272,7 +291,7 @@ def watch_tasks(session, tasklist, quiet=False, poll_interval=60, ki_handler=Non
if ki_handler is None: if ki_handler is None:
def ki_handler(progname, tasks, quiet): def ki_handler(progname, tasks, quiet):
if not quiet: if not quiet:
tlist = ['%s: %s' % (t.str(), t.display_state(t.info)) tlist = ['%s: %s' % (t.str(), t.display_state(t.info, level=t.level))
for t in tasks.values() if not t.is_done()] for t in tasks.values() if not t.is_done()]
print( print(
"Tasks still running. You can continue to watch with the" "Tasks still running. You can continue to watch with the"
@ -283,7 +302,7 @@ def watch_tasks(session, tasklist, quiet=False, poll_interval=60, ki_handler=Non
try: try:
tasks = {} tasks = {}
for task_id in tasklist: for task_id in tasklist:
tasks[task_id] = TaskWatcher(task_id, session, quiet=quiet) tasks[task_id] = TaskWatcher(task_id, session, quiet=quiet, topurl=topurl)
while True: while True:
all_done = True all_done = True
for task_id, task in list(tasks.items()): for task_id, task in list(tasks.items()):
@ -301,7 +320,7 @@ def watch_tasks(session, tasklist, quiet=False, poll_interval=60, ki_handler=Non
child_id = child['id'] child_id = child['id']
if child_id not in tasks.keys(): if child_id not in tasks.keys():
tasks[child_id] = TaskWatcher(child_id, session, task.level + 1, tasks[child_id] = TaskWatcher(child_id, session, task.level + 1,
quiet=quiet) quiet=quiet, topurl=topurl)
tasks[child_id].update() tasks[child_id].update()
# If we found new children, go through the list again, # If we found new children, go through the list again,
# in case they have children also # in case they have children also

2
plugins/cli/runroot.py
View file

@ -87,7 +87,7 @@ def handle_runroot(options, session, args):
if opts.watch: if opts.watch:
session.logout() session.logout()
return watch_tasks(session, [task_id], quiet=opts.quiet, return watch_tasks(session, [task_id], quiet=opts.quiet,
poll_interval=options.poll_interval) poll_interval=options.poll_interval, topurl=options.topurl)
try: try:
while True: while True:

3
plugins/cli/save_failed_tree.py
View file

@ -71,4 +71,5 @@ def handle_save_failed_tree(options, session, args):
else: else:
session.logout() session.logout()
return watch_tasks(session, [task_id], return watch_tasks(session, [task_id],
quiet=opts.quiet, poll_interval=options.poll_interval) quiet=opts.quiet, poll_interval=options.poll_interval,
topurl=options.topurl)

17
tests/test_cli/test_build.py
View file

@ -82,7 +82,8 @@ Task info: weburl/taskinfo?taskID=1
self.session.logout.assert_called() self.session.logout.assert_called()
watch_tasks_mock.assert_called_once_with( watch_tasks_mock.assert_called_once_with(
self.session, [task_id], quiet=self.options.quiet, self.session, [task_id], quiet=self.options.quiet,
poll_interval=self.options.poll_interval) poll_interval=self.options.poll_interval,
topurl=self.options.topurl)
self.assertEqual(rv, 0) self.assertEqual(rv, 0)
@mock.patch('sys.stdout', new_callable=six.StringIO) @mock.patch('sys.stdout', new_callable=six.StringIO)
@ -131,7 +132,7 @@ Task info: weburl/taskinfo?taskID=1
self.session.logout.assert_called() self.session.logout.assert_called()
watch_tasks_mock.assert_called_once_with( watch_tasks_mock.assert_called_once_with(
self.session, [task_id], quiet=self.options.quiet, self.session, [task_id], quiet=self.options.quiet,
poll_interval=self.options.poll_interval) poll_interval=self.options.poll_interval, topurl=self.options.topurl)
self.assertEqual(rv, 0) self.assertEqual(rv, 0)
@mock.patch('sys.stdout', new_callable=six.StringIO) @mock.patch('sys.stdout', new_callable=six.StringIO)
@ -326,7 +327,7 @@ Task info: weburl/taskinfo?taskID=1
self.session.logout.assert_called() self.session.logout.assert_called()
watch_tasks_mock.assert_called_once_with( watch_tasks_mock.assert_called_once_with(
self.session, [task_id], quiet=self.options.quiet, self.session, [task_id], quiet=self.options.quiet,
poll_interval=self.options.poll_interval) poll_interval=self.options.poll_interval, topurl=self.options.topurl)
self.assertEqual(rv, 0) self.assertEqual(rv, 0)
@mock.patch('sys.stderr', new_callable=six.StringIO) @mock.patch('sys.stderr', new_callable=six.StringIO)
@ -510,7 +511,7 @@ Task info: weburl/taskinfo?taskID=1
self.session.logout.assert_called() self.session.logout.assert_called()
watch_tasks_mock.assert_called_once_with( watch_tasks_mock.assert_called_once_with(
self.session, [task_id], quiet=self.options.quiet, self.session, [task_id], quiet=self.options.quiet,
poll_interval=self.options.poll_interval) poll_interval=self.options.poll_interval, topurl=self.options.topurl)
self.assertEqual(rv, 0) self.assertEqual(rv, 0)
@mock.patch('sys.stdout', new_callable=six.StringIO) @mock.patch('sys.stdout', new_callable=six.StringIO)
@ -559,7 +560,7 @@ Task info: weburl/taskinfo?taskID=1
self.session.logout.assert_called() self.session.logout.assert_called()
watch_tasks_mock.assert_called_once_with( watch_tasks_mock.assert_called_once_with(
self.session, [task_id], quiet=self.options.quiet, self.session, [task_id], quiet=self.options.quiet,
poll_interval=self.options.poll_interval) poll_interval=self.options.poll_interval, topurl=self.options.topurl)
self.assertEqual(rv, 0) self.assertEqual(rv, 0)
@mock.patch('sys.stdout', new_callable=six.StringIO) @mock.patch('sys.stdout', new_callable=six.StringIO)
@ -663,7 +664,7 @@ Task info: weburl/taskinfo?taskID=1
self.session.logout.assert_called_once() self.session.logout.assert_called_once()
watch_tasks_mock.assert_called_once_with( watch_tasks_mock.assert_called_once_with(
self.session, [task_id], quiet=self.options.quiet, self.session, [task_id], quiet=self.options.quiet,
poll_interval=self.options.poll_interval) poll_interval=self.options.poll_interval, topurl=self.options.topurl)
self.assertEqual(rv, 0) self.assertEqual(rv, 0)
@mock.patch('sys.stdout', new_callable=six.StringIO) @mock.patch('sys.stdout', new_callable=six.StringIO)
@ -713,7 +714,7 @@ Task info: weburl/taskinfo?taskID=1
self.session.logout.assert_called_once() self.session.logout.assert_called_once()
watch_tasks_mock.assert_called_once_with( watch_tasks_mock.assert_called_once_with(
self.session, [task_id], quiet=quiet, self.session, [task_id], quiet=quiet,
poll_interval=self.options.poll_interval) poll_interval=self.options.poll_interval, topurl=self.options.topurl)
self.assertEqual(rv, 0) self.assertEqual(rv, 0)
@mock.patch('sys.stdout', new_callable=six.StringIO) @mock.patch('sys.stdout', new_callable=six.StringIO)
@ -767,7 +768,7 @@ Task info: weburl/taskinfo?taskID=1
self.session.logout.assert_called_once() self.session.logout.assert_called_once()
watch_tasks_mock.assert_called_once_with( watch_tasks_mock.assert_called_once_with(
self.session, [task_id], quiet=self.options.quiet, self.session, [task_id], quiet=self.options.quiet,
poll_interval=self.options.poll_interval) poll_interval=self.options.poll_interval, topurl=self.options.topurl)
self.assertEqual(rv, 0) self.assertEqual(rv, 0)
@mock.patch('sys.stdout', new_callable=six.StringIO) @mock.patch('sys.stdout', new_callable=six.StringIO)

6
tests/test_cli/test_chain_build.py
View file

@ -82,7 +82,7 @@ Task info: weburl/taskinfo?taskID=1
self.session.logout.assert_called() self.session.logout.assert_called()
watch_tasks_mock.assert_called_once_with( watch_tasks_mock.assert_called_once_with(
self.session, [task_id], quiet=self.options.quiet, self.session, [task_id], quiet=self.options.quiet,
poll_interval=self.options.poll_interval) poll_interval=self.options.poll_interval, topurl=self.options.topurl)
self.assertEqual(rv, 0) self.assertEqual(rv, 0)
@mock.patch('sys.stdout', new_callable=six.StringIO) @mock.patch('sys.stdout', new_callable=six.StringIO)
@ -528,7 +528,7 @@ Task info: weburl/taskinfo?taskID=1
self.session.logout.assert_called() self.session.logout.assert_called()
watch_tasks_mock.assert_called_once_with( watch_tasks_mock.assert_called_once_with(
self.session, [task_id], quiet=self.options.quiet, self.session, [task_id], quiet=self.options.quiet,
poll_interval=self.options.poll_interval) poll_interval=self.options.poll_interval, topurl=self.options.topurl)
self.assertEqual(rv, 0) self.assertEqual(rv, 0)
@mock.patch('sys.stdout', new_callable=six.StringIO) @mock.patch('sys.stdout', new_callable=six.StringIO)
@ -591,7 +591,7 @@ Task info: weburl/taskinfo?taskID=1
self.session.logout.assert_called() self.session.logout.assert_called()
watch_tasks_mock.assert_called_once_with( watch_tasks_mock.assert_called_once_with(
self.session, [task_id], quiet=self.options.quiet, self.session, [task_id], quiet=self.options.quiet,
poll_interval=self.options.poll_interval) poll_interval=self.options.poll_interval, topurl=self.options.topurl)
self.assertEqual(rv, 0) self.assertEqual(rv, 0)
@mock.patch('sys.stdout', new_callable=six.StringIO) @mock.patch('sys.stdout', new_callable=six.StringIO)

2
tests/test_cli/test_dist_repo.py
View file

@ -97,7 +97,7 @@ via 'koji edit-tag -x distrepo.cancel_others=True'
self.session, self.session,
[self.task_id], [self.task_id],
quiet=self.options.quiet, quiet=self.options.quiet,
poll_interval=self.options.poll_interval) poll_interval=self.options.poll_interval, topurl=self.options.topurl)
def test_handle_dist_repo_nowait(self): def test_handle_dist_repo_nowait(self):
arguments = [self.tag_name, self.fake_key, '--nowait'] arguments = [self.tag_name, self.fake_key, '--nowait']

2
tests/test_cli/test_image_build.py
View file

@ -139,7 +139,7 @@ class TestBuildImageOz(utils.CliTestCase):
self.watch_tasks.assert_called_with( self.watch_tasks.assert_called_with(
self.session, [task_id], self.session, [task_id],
quiet=self.options.quiet, quiet=self.options.quiet,
poll_interval=self.options.poll_interval) poll_interval=self.options.poll_interval, topurl=self.options.topurl)
self.session.buildImageOz.assert_called_once() self.session.buildImageOz.assert_called_once()
def test_build_image_oz_background(self): def test_build_image_oz_background(self):

8
tests/test_cli/test_maven_build.py
View file

@ -85,7 +85,7 @@ Task info: weburl/taskinfo?taskID=1
self.session.logout.assert_called() self.session.logout.assert_called()
watch_tasks_mock.assert_called_once_with( watch_tasks_mock.assert_called_once_with(
self.session, [task_id], quiet=self.options.quiet, self.session, [task_id], quiet=self.options.quiet,
poll_interval=self.options.poll_interval) poll_interval=self.options.poll_interval, topurl=self.options.topurl)
self.assertEqual(rv, 0) self.assertEqual(rv, 0)
@mock.patch('sys.stdout', new_callable=six.StringIO) @mock.patch('sys.stdout', new_callable=six.StringIO)
@ -438,7 +438,7 @@ Task info: weburl/taskinfo?taskID=1
self.session.logout.assert_called_once() self.session.logout.assert_called_once()
watch_tasks_mock.assert_called_once_with( watch_tasks_mock.assert_called_once_with(
self.session, [task_id], quiet=build_opts.quiet, self.session, [task_id], quiet=build_opts.quiet,
poll_interval=self.options.poll_interval) poll_interval=self.options.poll_interval, topurl=self.options.topurl)
self.assertEqual(rv, 0) self.assertEqual(rv, 0)
stdout.seek(0) stdout.seek(0)
@ -608,7 +608,7 @@ Task info: weburl/taskinfo?taskID=1
self.session.logout.assert_called_once() self.session.logout.assert_called_once()
watch_tasks_mock.assert_called_once_with( watch_tasks_mock.assert_called_once_with(
self.session, [task_id], quiet=build_opts['quiet'], self.session, [task_id], quiet=build_opts['quiet'],
poll_interval=self.options.poll_interval) poll_interval=self.options.poll_interval, topurl=self.options.topurl)
self.assertEqual(rv, 0) self.assertEqual(rv, 0)
stdout.seek(0) stdout.seek(0)
@ -678,7 +678,7 @@ Task info: weburl/taskinfo?taskID=1
self.session.logout.assert_called() self.session.logout.assert_called()
watch_tasks_mock.assert_called_once_with( watch_tasks_mock.assert_called_once_with(
self.session, [task_id], quiet=self.options.quiet, self.session, [task_id], quiet=self.options.quiet,
poll_interval=self.options.poll_interval) poll_interval=self.options.poll_interval, topurl=self.options.topurl)
self.assertEqual(rv, 0) self.assertEqual(rv, 0)
@mock.patch('sys.stdout', new_callable=six.StringIO) @mock.patch('sys.stdout', new_callable=six.StringIO)

2
tests/test_cli/test_maven_chain.py
View file

@ -139,7 +139,7 @@ class TestMavenChain(utils.CliTestCase):
running_in_bg_mock.assert_called() running_in_bg_mock.assert_called()
watch_tasks_mock.assert_called_with( watch_tasks_mock.assert_called_with(
session, [self.task_id], quiet=options.quiet, session, [self.task_id], quiet=options.quiet,
poll_interval=options.poll_interval) poll_interval=options.poll_interval, topurl=options.topurl)
@mock.patch('sys.stdout', new_callable=six.StringIO) @mock.patch('sys.stdout', new_callable=six.StringIO)
@mock.patch('sys.stderr', new_callable=six.StringIO) @mock.patch('sys.stderr', new_callable=six.StringIO)

2
tests/test_cli/test_move_build.py
View file

@ -67,7 +67,7 @@ class TestMoveBuild(utils.CliTestCase):
self.session, self.session,
tasks, tasks,
quiet=self.options.quiet, quiet=self.options.quiet,
poll_interval=self.options.poll_interval) poll_interval=self.options.poll_interval, topurl=self.options.topurl)
def test_handle_move_build_nowait(self): def test_handle_move_build_nowait(self):
"""Test handle_move_build function with --nowait option""" """Test handle_move_build function with --nowait option"""

4
tests/test_cli/test_restart_host.py
View file

@ -46,7 +46,7 @@ class TestRestartHosts(utils.CliTestCase):
session.restartHosts.assert_called_with() session.restartHosts.assert_called_with()
session.logout.assert_called_once() session.logout.assert_called_once()
watch_tasks_mock.assert_called_with( watch_tasks_mock.assert_called_with(
session, [self.task_id], quiet=None, poll_interval=3) session, [self.task_id], quiet=None, poll_interval=3, topurl=options.topurl)
@mock.patch('sys.stderr', new_callable=six.StringIO) @mock.patch('sys.stderr', new_callable=six.StringIO)
@mock.patch('sys.stdout', new_callable=six.StringIO) @mock.patch('sys.stdout', new_callable=six.StringIO)
@ -148,7 +148,7 @@ class TestRestartHosts(utils.CliTestCase):
session.restartHosts.assert_called_with() session.restartHosts.assert_called_with()
session.logout.assert_called_once() session.logout.assert_called_once()
watch_tasks_mock.assert_called_with( watch_tasks_mock.assert_called_with(
session, [self.task_id], quiet=None, poll_interval=3) session, [self.task_id], quiet=None, poll_interval=3, topurl=options.topurl)
@mock.patch('koji_cli.commands.watch_tasks') @mock.patch('koji_cli.commands.watch_tasks')
@mock.patch('koji_cli.commands._running_in_bg') @mock.patch('koji_cli.commands._running_in_bg')

3
tests/test_cli/test_resubmit.py
View file

@ -83,7 +83,8 @@ Log Files:
session, session,
[new_task_id], [new_task_id],
quiet=True, quiet=True,
poll_interval=options.poll_interval) poll_interval=options.poll_interval,
topurl=options.topurl)
session.logout.assert_called_once() session.logout.assert_called_once()
session.resubmitTask.assert_called_with(self.task_id) session.resubmitTask.assert_called_with(self.task_id)
session.resubmitTask.assert_called_once() session.resubmitTask.assert_called_once()

2
tests/test_cli/test_tag_build.py
View file

@ -56,7 +56,7 @@ class TestTagBuild(utils.CliTestCase):
self.session, self.session,
tasks, tasks,
quiet=self.options.quiet, quiet=self.options.quiet,
poll_interval=self.options.poll_interval) poll_interval=self.options.poll_interval, topurl=self.options.topurl)
def test_handle_tag_build_quiet_mode(self): def test_handle_tag_build_quiet_mode(self):
"""Test handle_tag_build function with --nowait option""" """Test handle_tag_build function with --nowait option"""

12
tests/test_cli/test_watch_tasks.py
View file

@ -47,7 +47,7 @@ class TestWatchTasks(unittest.TestCase):
@mock.patch('sys.stdout', new_callable=six.StringIO) @mock.patch('sys.stdout', new_callable=six.StringIO)
def test_watch_tasks_no_tasklist(self, stdout): def test_watch_tasks_no_tasklist(self, stdout):
returned = watch_tasks(self.session, [], poll_interval=0) returned = watch_tasks(self.session, [], poll_interval=0, topurl=self.options.topurl)
actual = stdout.getvalue() actual = stdout.getvalue()
expected = "" expected = ""
self.assertIsNone(returned) self.assertIsNone(returned)
@ -60,7 +60,8 @@ class TestWatchTasks(unittest.TestCase):
with open(cfile) as fp: with open(cfile) as fp:
cdata = json.load(fp) cdata = json.load(fp)
self.session.load_calls(cdata) self.session.load_calls(cdata)
rv = watch_tasks(self.session, [1188], quiet=False, poll_interval=0) rv = watch_tasks(self.session, [1188], quiet=False, poll_interval=0,
topurl=self.options.topurl)
self.assertEqual(rv, 0) self.assertEqual(rv, 0)
expected = ( expected = (
'''Watching tasks (this may be safely interrupted)... '''Watching tasks (this may be safely interrupted)...
@ -80,7 +81,7 @@ class TestWatchTasks(unittest.TestCase):
with open(cfile) as fp: with open(cfile) as fp:
cdata = json.load(fp) cdata = json.load(fp)
self.session.load_calls(cdata) self.session.load_calls(cdata)
rv = watch_tasks(self.session, [1208], quiet=False, poll_interval=5) rv = watch_tasks(self.session, [1208], quiet=False, poll_interval=5, topurl=None)
self.assertEqual(rv, 1) self.assertEqual(rv, 1)
expected = ('''Watching tasks (this may be safely interrupted)... expected = ('''Watching tasks (this may be safely interrupted)...
1208 build (f24, /users/mikem/fake.git:master): free 1208 build (f24, /users/mikem/fake.git:master): free
@ -108,7 +109,8 @@ class TestWatchTasks(unittest.TestCase):
sleep.side_effect = [None] * 10 + [KeyboardInterrupt] sleep.side_effect = [None] * 10 + [KeyboardInterrupt]
with self.assertRaises(KeyboardInterrupt): with self.assertRaises(KeyboardInterrupt):
# watch_tasks catches and re-raises it to display a message # watch_tasks catches and re-raises it to display a message
watch_tasks(self.session, [1208], quiet=False, poll_interval=5) watch_tasks(self.session, [1208], quiet=False, poll_interval=5,
topurl=self.options.topurl)
expected = ('''Watching tasks (this may be safely interrupted)... expected = ('''Watching tasks (this may be safely interrupted)...
1208 build (f24, /users/mikem/fake.git:master): free 1208 build (f24, /users/mikem/fake.git:master): free
1208 build (f24, /users/mikem/fake.git:master): free -> open (builder-01) 1208 build (f24, /users/mikem/fake.git:master): free -> open (builder-01)
@ -137,7 +139,7 @@ Running Tasks:
with self.assertRaises(KeyboardInterrupt): with self.assertRaises(KeyboardInterrupt):
# watch_tasks catches and re-raises it to display a message # watch_tasks catches and re-raises it to display a message
watch_tasks(self.session, [1208], quiet=False, poll_interval=5, watch_tasks(self.session, [1208], quiet=False, poll_interval=5,
ki_handler=customized_handler) ki_handler=customized_handler, topurl=self.options.topurl)
expected = ('''Watching tasks (this may be safely interrupted)... expected = ('''Watching tasks (this may be safely interrupted)...
1208 build (f24, /users/mikem/fake.git:master): free 1208 build (f24, /users/mikem/fake.git:master): free
1208 build (f24, /users/mikem/fake.git:master): free -> open (builder-01) 1208 build (f24, /users/mikem/fake.git:master): free -> open (builder-01)

6
tests/test_cli/test_wrapper_rpm.py
View file

@ -80,7 +80,8 @@ class TestWrapperRpm(utils.CliTestCase):
activate_session_mock.assert_called_with(session, options) activate_session_mock.assert_called_with(session, options)
watch_tasks_mock.assert_called_with( watch_tasks_mock.assert_called_with(
session, [self.task_id], quiet=options.quiet, session, [self.task_id], quiet=options.quiet,
poll_interval=options.poll_interval) poll_interval=options.poll_interval,
topurl=options.topurl)
@mock.patch('sys.stdout', new_callable=six.StringIO) @mock.patch('sys.stdout', new_callable=six.StringIO)
@mock.patch('sys.stderr', new_callable=six.StringIO) @mock.patch('sys.stderr', new_callable=six.StringIO)
@ -190,7 +191,8 @@ class TestWrapperRpm(utils.CliTestCase):
activate_session_mock.assert_called_with(session, options) activate_session_mock.assert_called_with(session, options)
watch_tasks_mock.assert_called_with( watch_tasks_mock.assert_called_with(
session, [self.task_id], quiet=options.quiet, session, [self.task_id], quiet=options.quiet,
poll_interval=options.poll_interval) poll_interval=options.poll_interval,
topurl=options.topurl)
@mock.patch('sys.stdout', new_callable=six.StringIO) @mock.patch('sys.stdout', new_callable=six.StringIO)
@mock.patch('sys.stderr', new_callable=six.StringIO) @mock.patch('sys.stderr', new_callable=six.StringIO)

3
tests/test_plugins/test_save_failed_tree_cli.py
View file

@ -122,7 +122,8 @@ class TestSaveFailedTree(unittest.TestCase):
self.session.logout.assert_called_once_with() self.session.logout.assert_called_once_with()
save_failed_tree.watch_tasks.assert_called_once_with(self.session, [spawned_id], save_failed_tree.watch_tasks.assert_called_once_with(self.session, [spawned_id],
poll_interval=options.poll_interval, poll_interval=options.poll_interval,
quiet=options.quiet) quiet=options.quiet,
topurl=options.topurl)
@mock.patch('sys.stdout', new_callable=six.StringIO) @mock.patch('sys.stdout', new_callable=six.StringIO)
def test_handle_save_failed_tree_errors(self, stdout): def test_handle_save_failed_tree_errors(self, stdout):