x/bareon
Code Issues Proposed changes

Merge "Move label formatting to make_fs from driver"

Browse Source
This commit is contained in:
Jenkins
2015-11-20 14:22:01 +00:00
committed by Gerrit Code Review
parent c33563d561 b895d7dc49
commit c0fe576166
4 changed files with 33 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
fuel_agent/tests/test_fs_utils.py
View File

@@ -33,12 +33,12 @@ class TestFSUtils(unittest2.TestCase):
mock_exec.assert_called_once_with('mkfs.xfs', '-f', '/dev/fake')
def test_make_fs(self, mock_exec):
fu.make_fs('ext4', '-F', '-L fake_label', '/dev/fake')
fu.make_fs('ext4', '-F', 'fake_label', '/dev/fake')
mock_exec.assert_called_once_with('mkfs.ext4', '-F', '-L',
'fake_label', '/dev/fake')
def test_make_fs_swap(self, mock_exec):
fu.make_fs('swap', '-f', '-L fake_label', '/dev/fake')
fu.make_fs('swap', '-f', 'fake_label', '/dev/fake')
mock_exec.assert_called_once_with('mkswap', '-f', '-L', 'fake_label',
'/dev/fake')
@@ -128,3 +128,17 @@ class TestFSUtils(unittest2.TestCase):
self.assertRaises(errors.ProcessExecutionError,
fu.umount_fs, '/fake', try_lazy_umount=False)
self.assertEqual(expected_calls, mock_exec.call_args_list)
def test_format_fs_label(self, _):
short_label = 'label'
long_label = '0123456789ABCD'
long_label_trimmed = long_label[:12]
template = ' -L {0} '
self.assertEqual(fu.format_fs_label(None), '')
self.assertEqual(fu.format_fs_label(short_label),
template.format(short_label))
self.assertEqual(fu.format_fs_label(long_label),
template.format(long_label_trimmed))

8
fuel_agent/tests/test_nailgun.py
View File

@@ -1024,14 +1024,6 @@ class TestNailgunMockedMeta(unittest2.TestCase):
img.size, fake_image_meta['images'][0]['raw_size'])
self.assertEqual(img.md5, fake_image_meta['images'][0]['raw_md5'])
def test_getlabel(self, mock_lbd, mock_image_meta):
mock_lbd.return_value = LIST_BLOCK_DEVICES_SAMPLE
drv = nailgun.Nailgun(PROVISION_SAMPLE_DATA)
self.assertEqual('', drv._getlabel(None))
long_label = '1234567890ABCDEFGHIJKLMNOPQRSTUVWXYZ'
self.assertEqual(' -L %s ' % long_label[:12],
drv._getlabel(long_label))
def test_disk_dev_not_found(self, mock_lbd, mock_image_meta):
mock_lbd.return_value = LIST_BLOCK_DEVICES_SAMPLE
drv = nailgun.Nailgun(PROVISION_SAMPLE_DATA)