From b05295c2028115ca72e515314f6f6a5caaacedc0 Mon Sep 17 00:00:00 2001 From: Haibo Lin Date: Mon, 4 Nov 2019 14:22:59 +0800 Subject: [PATCH] Remove misleading warning about size of the ISO JIRA: COMPOSE-3885 Signed-off-by: Haibo Lin --- pungi/media_split.py | 7 ------- tests/test_media_split.py | 14 -------------- 2 files changed, 21 deletions(-) diff --git a/pungi/media_split.py b/pungi/media_split.py index 61d104b8..01cc5525 100644 --- a/pungi/media_split.py +++ b/pungi/media_split.py @@ -121,11 +121,4 @@ class MediaSplitter(object): disk["files"].append(name) disk["size"] += size total_size_single += size - if self.compose: - if self.media_size: - self.logger.debug("MediaSplitter: free space on single media would be %s. " - "Total size of single medium: %s." - % (self.media_size - total_size_single, total_size_single)) - else: - self.logger.debug("MediaSplitter: Total size of single medium: %s." % total_size_single) return disks diff --git a/tests/test_media_split.py b/tests/test_media_split.py index 9e7494cd..f4290126 100644 --- a/tests/test_media_split.py +++ b/tests/test_media_split.py @@ -62,17 +62,6 @@ class MediaSplitterTestCase(unittest.TestCase): def setUp(self): self.compose = mock.Mock() - def assertFreeSpace(self, free, total): - self.assertEqual( - self.compose._logger.debug.mock_calls, - [mock.call('MediaSplitter: free space on single media would be %s. ' - 'Total size of single medium: %s.' % (free, total))]) - - def assertUnlimited(self, total): - self.assertEqual( - self.compose._logger.debug.mock_calls, - [mock.call('MediaSplitter: Total size of single medium: %s.' % total)]) - def test_sum_size(self): ms = media_split.MediaSplitter(bl(100)) ms.add_file('first', bl(20)) @@ -107,7 +96,6 @@ class MediaSplitterTestCase(unittest.TestCase): self.assertEqual(ms.split(), [{'files': ['first', 'second'], 'size': bl(50)}]) - self.assertFreeSpace(bl(50), bl(50)) def test_split_on_two_discs(self): ms = media_split.MediaSplitter(bl(100), compose=self.compose) @@ -118,7 +106,6 @@ class MediaSplitterTestCase(unittest.TestCase): self.assertEqual(ms.split(), [{'files': ['first', 'second'], 'size': bl(65)}, {'files': ['third'], 'size': bl(80)}]) - self.assertFreeSpace(bl(100 - 25 - 40 - 80), bl(25 + 40 + 80)) def test_split_with_sticky_file(self): ms = media_split.MediaSplitter(bl(100)) @@ -139,4 +126,3 @@ class MediaSplitterTestCase(unittest.TestCase): self.assertEqual(ms.split(), [{'files': ['first', 'second', 'third'], 'size': bl(145)}]) - self.assertUnlimited(bl(25 + 40 + 80))