robojerk/tumbi-assembler
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

ostree: Fix arg passed to scm.get_dir_from_scm

Browse source 
A compose object should be passed instead of logger.

JIRA: COMPOSE-4050
Signed-off-by: Haibo Lin <hlin@redhat.com>
This commit is contained in:
Haibo Lin 2020-01-02 10:16:50 +08:00 • committed by lsedlar
parent b8bb4f7daa
commit b415e31f9d
4 changed files with 12 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

2
tests/test_ostree_installer_phase.py
View file

@ -437,7 +437,7 @@ class OstreeThreadTest(helpers.PungiTestCase):
self.assertEqual(get_dir_from_scm.call_args_list,
[mock.call({'scm': 'git', 'repo': 'git://example.com/templates.git',
'branch': 'f24', 'dir': '.'},
templ_dir, logger=pool._logger)])
templ_dir, compose=self.compose)])
self.assertRunrootCall(koji,
["http://example.com/repo/1",
'http://example.com/work/$basearch/comps_repo_Everything'],

10
tests/test_ostree_phase.py
View file

@ -130,7 +130,7 @@ class OSTreeThreadTest(helpers.PungiTestCase):
})
self.pool = mock.Mock()
def _dummy_config_repo(self, scm_dict, target, logger=None):
def _dummy_config_repo(self, scm_dict, target, compose=None):
os.makedirs(target)
helpers.touch(os.path.join(target, 'fedora-atomic-docker-host.json'),
json.dumps({'ref': 'fedora-atomic/25/x86_64',
@ -202,7 +202,7 @@ class OSTreeThreadTest(helpers.PungiTestCase):
self.assertEqual(get_dir_from_scm.call_args_list,
[mock.call({'scm': 'git', 'repo': 'https://git.fedorahosted.org/git/fedora-atomic.git',
'branch': 'f24', 'dir': '.'},
self.topdir + '/work/ostree-1/config_repo', logger=self.pool._logger)])
self.topdir + '/work/ostree-1/config_repo', compose=self.compose)])
self.assertEqual(koji.get_runroot_cmd.call_args_list,
[mock.call('rrt', 'x86_64',
['pungi-make-ostree',
@ -371,7 +371,7 @@ class OSTreeThreadTest(helpers.PungiTestCase):
self.assertEqual(get_dir_from_scm.call_args_list,
[mock.call({'scm': 'git', 'repo': 'https://git.fedorahosted.org/git/fedora-atomic.git',
'branch': 'f24', 'dir': '.'},
self.topdir + '/work/ostree-1/config_repo', logger=self.pool._logger)])
self.topdir + '/work/ostree-1/config_repo', compose=self.compose)])
self.assertEqual(koji.get_runroot_cmd.call_args_list,
[mock.call('rrt', 'x86_64',
['pungi-make-ostree',
@ -406,7 +406,7 @@ class OSTreeThreadTest(helpers.PungiTestCase):
self.assertEqual(get_dir_from_scm.call_args_list,
[mock.call({'scm': 'git', 'repo': 'https://git.fedorahosted.org/git/fedora-atomic.git',
'branch': 'f24', 'dir': '.'},
self.topdir + '/work/ostree-1/config_repo', logger=self.pool._logger)])
self.topdir + '/work/ostree-1/config_repo', compose=self.compose)])
self.assertEqual(koji.get_runroot_cmd.call_args_list,
[mock.call('rrt', 'x86_64',
['pungi-make-ostree',
@ -441,7 +441,7 @@ class OSTreeThreadTest(helpers.PungiTestCase):
self.assertEqual(get_dir_from_scm.call_args_list,
[mock.call({'scm': 'git', 'repo': 'https://git.fedorahosted.org/git/fedora-atomic.git',
'branch': 'f24', 'dir': '.'},
self.topdir + '/work/ostree-1/config_repo', logger=self.pool._logger)])
self.topdir + '/work/ostree-1/config_repo', compose=self.compose)])
self.assertEqual(koji.get_runroot_cmd.call_args_list,
[mock.call('rrt', 'x86_64',
['pungi-make-ostree',