diff options
| author | Jenkins <jenkins@review.openstack.org> | 2012-11-09 15:27:48 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2012-11-09 15:27:48 +0000 |
| commit | 4312c795cfcbc05a9bf99d3fbdddd9b3eca30e35 (patch) | |
| tree | 1a3525669d3f2824674a259dfff8c690d65bbc6b /nova/tests | |
| parent | 528add2df39c2381cc7992a5026d283eea8816fa (diff) | |
| parent | 3001c7918f503a04e85bfb429321d13129ddd180 (diff) | |
Merge "Make utils.mkfs() set label when fs=swap"
Diffstat (limited to 'nova/tests')
| -rw-r--r-- | nova/tests/test_utils.py | 15 |
1 files changed, 15 insertions, 0 deletions
diff --git a/nova/tests/test_utils.py b/nova/tests/test_utils.py index 8b883f755..9ec0e85da 100644 --- a/nova/tests/test_utils.py +++ b/nova/tests/test_utils.py @@ -780,8 +780,23 @@ class MkfsTestCase(test.TestCase): def test_mkfs(self): self.mox.StubOutWithMock(utils, 'execute') utils.execute('mkfs', '-t', 'ext4', '-F', '/my/block/dev') + utils.execute('mkfs', '-t', 'msdos', '/my/msdos/block/dev') utils.execute('mkswap', '/my/swap/block/dev') self.mox.ReplayAll() utils.mkfs('ext4', '/my/block/dev') + utils.mkfs('msdos', '/my/msdos/block/dev') utils.mkfs('swap', '/my/swap/block/dev') + + def test_mkfs_with_label(self): + self.mox.StubOutWithMock(utils, 'execute') + utils.execute('mkfs', '-t', 'ext4', '-F', + '-L', 'ext4-vol', '/my/block/dev') + utils.execute('mkfs', '-t', 'msdos', + '-n', 'msdos-vol', '/my/msdos/block/dev') + utils.execute('mkswap', '-L', 'swap-vol', '/my/swap/block/dev') + self.mox.ReplayAll() + + utils.mkfs('ext4', '/my/block/dev', 'ext4-vol') + utils.mkfs('msdos', '/my/msdos/block/dev', 'msdos-vol') + utils.mkfs('swap', '/my/swap/block/dev', 'swap-vol') |