almalinux/pungi
14
1
Fork 0
Code Issues Pull Requests Releases Activity

Revert "live-media: Call correct koji alias"

Browse Source 
This was accidently merged and is not correct
This reverts commit 02beb35e67.

Signed-off-by: Dennis Gilmore <dennis@ausil.us>
This commit is contained in:
Dennis Gilmore 2017-01-30 04:21:14 -06:00
parent dc7d3b36ab
commit c650f04d0b
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pungi/wrappers/kojiwrapper.py
View File

@ -165,7 +165,7 @@ class KojiWrapper(object):
def get_live_media_cmd(self, options, wait=True): def get_live_media_cmd(self, options, wait=True):
# Usage: koji spin-livemedia [options] <name> <version> <target> <arch> <kickstart-file> # Usage: koji spin-livemedia [options] <name> <version> <target> <arch> <kickstart-file>
cmd = [self.executable, 'spin-livemedia'] cmd = ['koji', 'spin-livemedia']
for key in ('name', 'version', 'target', 'arch', 'ksfile'): for key in ('name', 'version', 'target', 'arch', 'ksfile'):
if key not in options: if key not in options:

4
tests/test_koji_wrapper.py
View File

@ -288,7 +288,7 @@ class LiveMediaTestCase(KojiWrapperBaseTestCase):
} }
cmd = self.koji.get_live_media_cmd(opts) cmd = self.koji.get_live_media_cmd(opts)
self.assertEqual(cmd, self.assertEqual(cmd,
['custom-koji', 'spin-livemedia', 'name', '1', 'tgt', 'x,y,z', 'kickstart', ['koji', 'spin-livemedia', 'name', '1', 'tgt', 'x,y,z', 'kickstart',
'--install-tree=/mnt/os', '--wait']) '--install-tree=/mnt/os', '--wait'])
def test_get_live_media_cmd_full(self): def test_get_live_media_cmd_full(self):
@ -300,7 +300,7 @@ class LiveMediaTestCase(KojiWrapperBaseTestCase):
} }
cmd = self.koji.get_live_media_cmd(opts) cmd = self.koji.get_live_media_cmd(opts)
self.assertEqual(cmd[:8], self.assertEqual(cmd[:8],
['custom-koji', 'spin-livemedia', 'name', '1', 'tgt', 'x,y,z', 'kickstart', ['koji', 'spin-livemedia', 'name', '1', 'tgt', 'x,y,z', 'kickstart',
'--install-tree=/mnt/os']) '--install-tree=/mnt/os'])
self.assertItemsEqual(cmd[8:], self.assertItemsEqual(cmd[8:],
['--repo=repo-1', '--repo=repo-2', '--skip-tag', '--scratch', '--wait', ['--repo=repo-1', '--repo=repo-2', '--skip-tag', '--scratch', '--wait',