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

Merge #190 `[live-images] Rename log file`

This commit is contained in:
Dennis Gilmore 2016-02-26 13:54:01 +00:00
parent 8670452b6b abb27ac7d7
commit e6596d818c
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pungi/phases/live_images.py
View File

@ -213,7 +213,7 @@ class CreateLiveImageThread(WorkerThread):
def worker(self, compose, cmd, variant, arch, num):
self.basename = '%(name)s-%(version)s-%(release)s' % cmd
log_file = compose.paths.log.log_file(arch, "createiso-%s" % self.basename)
log_file = compose.paths.log.log_file(arch, "liveimage-%s" % self.basename)
msg = "Creating ISO (arch: %s, variant: %s): %s" % (arch, variant, self.basename)
self.pool.log_info("[BEGIN] %s" % msg)

6
tests/test_liveimagesphase.py
View File

@ -307,7 +307,7 @@ class TestCreateLiveImageThread(PungiTestCase):
self.assertEqual(koji_wrapper.run_blocking_cmd.mock_calls,
[mock.call('koji spin-livecd ...',
log_file=self.topdir + '/logs/amd64/createiso-None-None-None.amd64.log')])
log_file=self.topdir + '/logs/amd64/liveimage-None-None-None.amd64.log')])
self.assertEqual(koji_wrapper.get_image_path.mock_calls, [mock.call(123)])
self.assertEqual(copy2.mock_calls,
[mock.call('/path/to/image.iso', self.topdir + '/compose/Client/amd64/iso/image-name')])
@ -385,7 +385,7 @@ class TestCreateLiveImageThread(PungiTestCase):
self.assertEqual(koji_wrapper.run_blocking_cmd.mock_calls,
[mock.call('koji spin-livecd ...',
log_file=self.topdir + '/logs/amd64/createiso-None-None-None.amd64.log')])
log_file=self.topdir + '/logs/amd64/liveimage-None-None-None.amd64.log')])
self.assertEqual(koji_wrapper.get_image_path.mock_calls, [mock.call(123)])
self.assertEqual(copy2.mock_calls,
[mock.call('/path/to/image.iso', self.topdir + '/compose/Client/amd64/iso/image.iso')])
@ -464,7 +464,7 @@ class TestCreateLiveImageThread(PungiTestCase):
self.assertEqual(koji_wrapper.run_blocking_cmd.mock_calls,
[mock.call('koji spin-livecd ...',
log_file=self.topdir + '/logs/amd64/createiso-None-None-None.amd64.log')])
log_file=self.topdir + '/logs/amd64/liveimage-None-None-None.amd64.log')])
self.assertEqual(koji_wrapper.get_image_path.mock_calls, [mock.call(123)])
self.assertEqual(copy2.mock_calls,
[mock.call('/path/to/image-a.b-sda.raw.xz', self.topdir + '/compose/Client/amd64/iso/image-name')])