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

Remove misleading warning about size of the ISO

Browse Source 
JIRA: COMPOSE-3885
Signed-off-by: Haibo Lin <hlin@redhat.com>
This commit is contained in:
Haibo Lin 2019-11-04 14:22:59 +08:00
parent 114df77c6b
commit b05295c202
2 changed files with 0 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
pungi/media_split.py
View File

@ -121,11 +121,4 @@ class MediaSplitter(object):
disk["files"].append(name) disk["files"].append(name)
disk["size"] += size disk["size"] += size
total_size_single += 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 return disks

14
tests/test_media_split.py
View File

@ -62,17 +62,6 @@ class MediaSplitterTestCase(unittest.TestCase):
def setUp(self): def setUp(self):
self.compose = mock.Mock() 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): def test_sum_size(self):
ms = media_split.MediaSplitter(bl(100)) ms = media_split.MediaSplitter(bl(100))
ms.add_file('first', bl(20)) ms.add_file('first', bl(20))
@ -107,7 +96,6 @@ class MediaSplitterTestCase(unittest.TestCase):
self.assertEqual(ms.split(), self.assertEqual(ms.split(),
[{'files': ['first', 'second'], 'size': bl(50)}]) [{'files': ['first', 'second'], 'size': bl(50)}])
self.assertFreeSpace(bl(50), bl(50))
def test_split_on_two_discs(self): def test_split_on_two_discs(self):
ms = media_split.MediaSplitter(bl(100), compose=self.compose) ms = media_split.MediaSplitter(bl(100), compose=self.compose)
@ -118,7 +106,6 @@ class MediaSplitterTestCase(unittest.TestCase):
self.assertEqual(ms.split(), self.assertEqual(ms.split(),
[{'files': ['first', 'second'], 'size': bl(65)}, [{'files': ['first', 'second'], 'size': bl(65)},
{'files': ['third'], 'size': bl(80)}]) {'files': ['third'], 'size': bl(80)}])
self.assertFreeSpace(bl(100 - 25 - 40 - 80), bl(25 + 40 + 80))
def test_split_with_sticky_file(self): def test_split_with_sticky_file(self):
ms = media_split.MediaSplitter(bl(100)) ms = media_split.MediaSplitter(bl(100))
@ -139,4 +126,3 @@ class MediaSplitterTestCase(unittest.TestCase):
self.assertEqual(ms.split(), self.assertEqual(ms.split(),
[{'files': ['first', 'second', 'third'], 'size': bl(145)}]) [{'files': ['first', 'second', 'third'], 'size': bl(145)}])
self.assertUnlimited(bl(25 + 40 + 80))