From abb27ac7d70a4b572b8aa0d001bbd475f8065a34 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Lubom=C3=ADr=20Sedl=C3=A1=C5=99?= Date: Fri, 26 Feb 2016 12:05:58 +0100 Subject: [PATCH] [live-images] Rename log file MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit The log file started with createiso-, which is utterly confusing. With this patch, the logs are named with liveimage- prefix. Signed-off-by: Lubomír Sedlář --- pungi/phases/live_images.py | 2 +- tests/test_liveimagesphase.py | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/pungi/phases/live_images.py b/pungi/phases/live_images.py index e1b7d899..86f33d63 100644 --- a/pungi/phases/live_images.py +++ b/pungi/phases/live_images.py @@ -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) diff --git a/tests/test_liveimagesphase.py b/tests/test_liveimagesphase.py index 51185987..72bc5359 100755 --- a/tests/test_liveimagesphase.py +++ b/tests/test_liveimagesphase.py @@ -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')])