From 878284c85ccbcdf997620e43adeaecdf8979fd08 Mon Sep 17 00:00:00 2001 From: Tomas Kopecek Date: Oct 06 2020 12:59:12 +0000 Subject: PR#2531: cli: fix tests Merges #2531 https://pagure.io/koji/pull-request/2531 Fixes: #1870 https://pagure.io/koji/issue/1870 a new API to get tag extra with / without inheritance --- diff --git a/cli/koji b/cli/koji index f4b5e48..badabcb 100755 --- a/cli/koji +++ b/cli/koji @@ -76,7 +76,7 @@ def load_plugins(plugin_paths): logger = logging.getLogger('koji.plugins') # first, always load plugins from koji_cli_plugins module paths = [ - '%s/lib/python%s.%s/site-packages/koji_cli_plugins' % + '%s/lib/python%s.%s/site-packages/koji_cli_plugins' % (sys.prefix, sys.version_info[0], sys.version_info[1]), '%s/lib64/python%s.%s/site-packages/koji_cli_plugins' % (sys.prefix, sys.version_info[0], sys.version_info[1]) diff --git a/tests/test_cli/test_clone_tag.py b/tests/test_cli/test_clone_tag.py index 6d24ded..2ab39a6 100644 --- a/tests/test_cli/test_clone_tag.py +++ b/tests/test_cli/test_clone_tag.py @@ -9,6 +9,7 @@ try: except ImportError: import unittest +import koji from koji_cli.commands import handle_clone_tag from . import utils @@ -90,7 +91,7 @@ clone-tag will create the destination tag if it does not already exist def test_handle_clone_tag_no_srctag(self): args = ['src-tag', 'dst-tag'] - self.session.getTag.side_effect = [None, None] + self.session.getBuildConfig.side_effect = koji.GenericError self.assert_system_exit( handle_clone_tag, self.options, @@ -178,28 +179,29 @@ clone-tag will create the destination tag if it does not already exist {'package': 'bpkg', 'blocked': False}] }] - self.session.getTag.side_effect = [{'id': 1, - 'name': 'src-tag', + self.session.getTag.side_effect = [None, + {'id': 2, + 'name': 'dst-tag', 'arches': 'arch1 arch2', 'perm_id': 1, 'maven_support': False, 'maven_include_all': True, 'locked': False, - 'extra': {}}, - None, - {'id': 2, - 'name': 'dst-tag', + 'extra': {}}] + self.session.getBuildConfig.side_effect = [{'id': 1, + 'name': 'src-tag', 'arches': 'arch1 arch2', 'perm_id': 1, 'maven_support': False, 'maven_include_all': True, 'locked': False, - 'extra': {}}] + 'extra': {}}, + ] 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'), - call.getTag('src-tag', event=None), + call.getBuildConfig('src-tag', event=None), call.getTag('dst-tag'), call.createTag('dst-tag', arches='arch1 arch2', @@ -457,15 +459,15 @@ List of changes: {'package': 'fpkg', 'blocked': False}]} ]] - self.session.getTag.side_effect = [{'id': 1, + self.session.getBuildConfig.side_effect = [{'id': 1, 'name': 'src-tag', 'arches': 'arch1 arch2', 'perm_id': 1, 'maven_support': False, 'maven_include_all': True, 'locked': False, - 'extra': {}}, - {'id': 2, + 'extra': {}}] + self.session.getTag.side_effect = [{'id': 2, 'name': 'dst-tag', 'arches': 'arch1 arch2', 'perm_id': 1, @@ -484,7 +486,7 @@ List of changes: handle_clone_tag(self.options, self.session, args) self.activate_session.assert_called_once() self.session.assert_has_calls([call.hasPerm('admin'), - call.getTag('src-tag', event=None), + call.getBuildConfig('src-tag', event=None), call.getTag('dst-tag'), call.editTag2(2, arches='arch1 arch2', extra={}, locked=False, @@ -654,15 +656,15 @@ List of changes: [], ] self.session.getTagGroups.return_value = [] - self.session.getTag.side_effect = [{'id': 1, + self.session.getBuildConfig.side_effect = [{'id': 1, 'name': 'src-tag', 'arches': 'arch1 arch2', 'perm_id': 1, 'maven_support': False, 'maven_include_all': True, 'locked': False, - 'extra': {}}, - {'id': 2, + 'extra': {}}] + self.session.getTag.side_effect = [ {'id': 2, 'name': 'dst-tag', 'arches': 'arch1 arch2', 'perm_id': 1, @@ -741,15 +743,7 @@ List of changes: ] ] self.session.getTagGroups.return_value = [] - self.session.getTag.side_effect = [{'id': 1, - 'name': 'src-tag', - 'arches': 'arch1 arch2', - 'perm_id': 1, - 'maven_support': False, - 'maven_include_all': True, - 'locked': False, - 'extra': {}}, - {'id': 2, + self.session.getTag.side_effect = [{'id': 2, 'name': 'dst-tag', 'arches': 'arch1 arch2', 'perm_id': 1, @@ -765,6 +759,15 @@ List of changes: 'maven_include_all': True, 'locked': False, 'extra': {}}] + self.session.getBuildConfig.return_value = { + 'id': 1, + 'name': 'src-tag', + 'arches': 'arch1 arch2', + 'perm_id': 1, + 'maven_support': False, + 'maven_include_all': True, + 'locked': False, + 'extra': {}} handle_clone_tag(self.options, self.session, args) self.activate_session.assert_called_once() self.assert_console_message(stdout, """ @@ -821,30 +824,31 @@ List of changes: ] ] self.session.getTagGroups.return_value = [] - self.session.getTag.side_effect = [{'id': 1, - 'name': 'src-tag', + self.session.getTag.side_effect = [{'id': 2, + 'name': 'dst-tag', 'arches': 'arch1 arch2', 'perm_id': 1, 'maven_support': False, 'maven_include_all': True, 'locked': False, 'extra': {}}, - {'id': 2, + {'id': 2, 'name': 'dst-tag', 'arches': 'arch1 arch2', 'perm_id': 1, 'maven_support': False, 'maven_include_all': True, 'locked': False, - 'extra': {}}, - {'id': 2, - 'name': 'dst-tag', + 'extra': {}}] + self.session.getBuildConfig.side_effect = [{'id': 1, + 'name': 'src-tag', 'arches': 'arch1 arch2', 'perm_id': 1, 'maven_support': False, 'maven_include_all': True, 'locked': False, - 'extra': {}}] + 'extra': {}}, + ] handle_clone_tag(self.options, self.session, args) self.activate_session.assert_called_once() self.assert_console_message(stdout, """