robojerk/tumbi-assembler
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

media-split: Print sensible message for unlimited size

Browse source 
If the media is bootable, we can not split it. The limit is not used in
that case and we may overflow it with an warning message. The warning
should correctly mention what is going on instead of printing a
non-sensical message about free space on media being some huge number.

Signed-off-by: Lubomír Sedlář <lsedlar@redhat.com>
This commit is contained in:
Lubomír Sedlář 2016-11-08 14:39:24 +01:00
parent b7813d34ac
commit 6203541ac6
2 changed files with 39 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

32
tests/test_media_split.py
View file

@ -7,6 +7,7 @@ except ImportError:
import unittest
import os
import sys
import mock
sys.path.insert(0, os.path.join(os.path.dirname(__file__), '..'))
@ -59,6 +60,20 @@ def bl(s):
class MediaSplitterTestCase(unittest.TestCase):
def setUp(self):
self.compose = mock.Mock()
def assertFreeSpace(self, free, total):
self.assertEqual(
self.compose.mock_calls,
[mock.call.log_debug('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.mock_calls,
[mock.call.log_debug('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))
@ -87,15 +102,16 @@ class MediaSplitterTestCase(unittest.TestCase):
ms.add_file('too-big', bl(300))
def test_fit_on_one(self):
ms = media_split.MediaSplitter(bl(100))
ms = media_split.MediaSplitter(bl(100), compose=self.compose)
ms.add_file('first', bl(20))
ms.add_file('second', bl(30))
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))
ms = media_split.MediaSplitter(bl(100), compose=self.compose)
ms.add_file('first', bl(25))
ms.add_file('second', bl(40))
ms.add_file('third', bl(80))
@ -103,6 +119,7 @@ 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))
@ -115,5 +132,16 @@ class MediaSplitterTestCase(unittest.TestCase):
[{'files': ['sticky', 'first', 'second'], 'size': bl(80)},
{'files': ['sticky', 'third'], 'size': bl(95)}])
def test_split_unlimited_media(self):
ms = media_split.MediaSplitter(None, compose=self.compose)
ms.add_file('first', bl(25))
ms.add_file('second', bl(40))
ms.add_file('third', bl(80))
self.assertEqual(ms.split(),
[{'files': ['first', 'second', 'third'], 'size': bl(145)}])
self.assertUnlimited(bl(25 + 40 + 80))
if __name__ == "__main__":
unittest.main()