PR#2464: cli: clone-tag fails on failed multicalls
Merges #2464 https://pagure.io/koji/pull-request/2464 Fixes: #2010 https://pagure.io/koji/issue/2010 clone-tag should check all the server-side errors
This commit is contained in:
Tomas Kopecek
commit
37cd4223e4
2 changed files with 31 additions and 15 deletions
|
|
@ -3354,6 +3354,17 @@ def anon_handle_hostinfo(goptions, session, args):
|
|||
print("None")
|
||||
|
||||
|
||||
def _multicall_with_check(session, batch_size):
|
||||
"""Helper for running multicall inside handle_clone_tag"""
|
||||
err = False
|
||||
for r in session.multiCall(batch=batch_size):
|
||||
if isinstance(r, dict):
|
||||
warn(r['faultString'])
|
||||
err = True
|
||||
if err:
|
||||
error('Errors during the last call. Target tag could be inconsistent.')
|
||||
|
||||
|
||||
def handle_clone_tag(goptions, session, args):
|
||||
"[admin] Duplicate the contents of one tag onto another tag"
|
||||
usage = _("usage: %prog clone-tag [options] <src-tag> <dst-tag>")
|
||||
|
|
@ -3466,7 +3477,7 @@ def handle_clone_tag(goptions, session, args):
|
|||
block=pkgs['blocked'],
|
||||
extra_arches=pkgs['extra_arches'])
|
||||
if not options.test:
|
||||
session.multiCall(batch=options.batch)
|
||||
_multicall_with_check(session, options.batch)
|
||||
if options.builds:
|
||||
# get --all latest builds from src tag
|
||||
builds = reversed(session.listTagged(srctag['id'],
|
||||
|
|
@ -3491,7 +3502,7 @@ def handle_clone_tag(goptions, session, args):
|
|||
force=options.force,
|
||||
notify=options.notify)
|
||||
if not options.test:
|
||||
session.multiCall(batch=options.batch)
|
||||
_multicall_with_check(session, options.batch)
|
||||
if options.groups:
|
||||
# Copy the group data
|
||||
srcgroups = session.getTagGroups(srctag['name'],
|
||||
|
|
@ -3509,7 +3520,7 @@ def handle_clone_tag(goptions, session, args):
|
|||
block=pkg['blocked'])
|
||||
chggrplist.append(('[new]', pkg['package'], group['name']))
|
||||
if not options.test:
|
||||
session.multiCall(batch=options.batch)
|
||||
_multicall_with_check(session, options.batch)
|
||||
# case of existing dst-tag.
|
||||
if dsttag:
|
||||
# get fresh list of packages & builds into maps.
|
||||
|
|
@ -3669,7 +3680,7 @@ def handle_clone_tag(goptions, session, args):
|
|||
block=pkg['blocked'],
|
||||
extra_arches=pkg['extra_arches'])
|
||||
if not options.test:
|
||||
session.multiCall(batch=options.batch)
|
||||
_multicall_with_check(session, options.batch)
|
||||
# DEL builds. To keep the order we should untag builds at first
|
||||
if not options.test:
|
||||
session.multicall = True
|
||||
|
|
@ -3691,7 +3702,7 @@ def handle_clone_tag(goptions, session, args):
|
|||
force=options.force,
|
||||
notify=options.notify)
|
||||
if not options.test:
|
||||
session.multiCall(batch=options.batch)
|
||||
_multicall_with_check(session, options.batch)
|
||||
# ADD builds.
|
||||
if not options.test:
|
||||
session.multicall = True
|
||||
|
|
@ -3711,7 +3722,7 @@ def handle_clone_tag(goptions, session, args):
|
|||
force=options.force,
|
||||
notify=options.notify)
|
||||
if not options.test:
|
||||
session.multiCall(batch=options.batch)
|
||||
_multicall_with_check(session, options.batch)
|
||||
# ADD groups.
|
||||
if not options.test:
|
||||
session.multicall = True
|
||||
|
|
@ -3728,7 +3739,7 @@ def handle_clone_tag(goptions, session, args):
|
|||
force=options.force)
|
||||
chggrplist.append(('[new]', pkg['package'], group['name']))
|
||||
if not options.test:
|
||||
session.multiCall(batch=options.batch)
|
||||
_multicall_with_check(session, options.batch)
|
||||
# ADD group pkgs.
|
||||
if not options.test:
|
||||
session.multicall = True
|
||||
|
|
@ -3741,7 +3752,7 @@ def handle_clone_tag(goptions, session, args):
|
|||
pkg,
|
||||
force=options.force)
|
||||
if not options.test:
|
||||
session.multiCall(batch=options.batch)
|
||||
_multicall_with_check(session, options.batch)
|
||||
if options.delete:
|
||||
# DEL packages
|
||||
ninhrtpdellist = []
|
||||
|
|
@ -3762,6 +3773,8 @@ def handle_clone_tag(goptions, session, args):
|
|||
if not options.test:
|
||||
session.multicall = True
|
||||
for pkg, [builds] in zip(ninhrtpdellist, bump_builds):
|
||||
if isinstance(builds, dict):
|
||||
error(builds['faultString'])
|
||||
# remove all its builds first if there are any.
|
||||
for build in builds:
|
||||
# add missing 'name' field.
|
||||
|
|
@ -3798,7 +3811,7 @@ def handle_clone_tag(goptions, session, args):
|
|||
if not options.test:
|
||||
session.packageListBlock(dsttag['name'], pkg['package_name'])
|
||||
if not options.test:
|
||||
session.multiCall(batch=options.batch)
|
||||
_multicall_with_check(session, options.batch)
|
||||
# DEL groups.
|
||||
if not options.test:
|
||||
session.multicall = True
|
||||
|
|
@ -3818,7 +3831,7 @@ def handle_clone_tag(goptions, session, args):
|
|||
for pkg in group['packagelist']:
|
||||
chggrplist.append(('[blk]', pkg['package'], group['name']))
|
||||
if not options.test:
|
||||
session.multiCall(batch=options.batch)
|
||||
_multicall_with_check(session, options.batch)
|
||||
# DEL group pkgs.
|
||||
if not options.test:
|
||||
session.multicall = True
|
||||
|
|
@ -3839,7 +3852,7 @@ def handle_clone_tag(goptions, session, args):
|
|||
group,
|
||||
pkg)
|
||||
if not options.test:
|
||||
session.multiCall(batch=options.batch)
|
||||
_multicall_with_check(session, options.batch)
|
||||
# print final list of actions.
|
||||
if options.verbose:
|
||||
pfmt = ' %-7s %-28s %-10s %-10s %-10s\n'
|
||||
|
|
|
|||
|
|
@ -99,8 +99,8 @@ clone-tag will create the destination tag if it does not already exist
|
|||
stderr=self.format_error_message("Unknown src-tag: src-tag"),
|
||||
activate_session=None)
|
||||
self.activate_session.assert_called_once()
|
||||
self.activate_session.getTag.has_called([mock.call('src-tag'),
|
||||
mock.call('dst-tag')])
|
||||
self.activate_session.getTag.has_called([call('src-tag'),
|
||||
call('dst-tag')])
|
||||
|
||||
def test_handle_clone_tag_locked(self):
|
||||
args = ['src-tag', 'dst-tag']
|
||||
|
|
@ -118,9 +118,11 @@ clone-tag will create the destination tag if it does not already exist
|
|||
"Please use --force if this is what you really want to do."),
|
||||
activate_session=None)
|
||||
self.activate_session.assert_called_once()
|
||||
self.activate_session.getTag.has_called([mock.call('src-tag'),
|
||||
mock.call('dst-tag')])
|
||||
self.activate_session.getTag.has_called([call('src-tag'),
|
||||
call('dst-tag')])
|
||||
|
||||
self.activate_session.getTag.has_called([call('src-tag'),
|
||||
call('dst-tag')])
|
||||
@mock.patch('sys.stdout', new_callable=six.StringIO)
|
||||
def test_handle_clone_tag_new_dsttag(self, stdout):
|
||||
args = ['src-tag', 'dst-tag', '--all', '-v']
|
||||
|
|
@ -191,6 +193,7 @@ clone-tag will create the destination tag if it does not already exist
|
|||
'maven_support': False,
|
||||
'maven_include_all': True,
|
||||
'locked': False}]
|
||||
self.session.multiCall.return_value = []
|
||||
handle_clone_tag(self.options, self.session, args)
|
||||
self.activate_session.assert_called_once()
|
||||
self.session.assert_has_calls([call.hasPerm('admin'),
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue