From 3001c7918f503a04e85bfb429321d13129ddd180 Mon Sep 17 00:00:00 2001 From: Arata Notsu Date: Sat, 10 Nov 2012 00:03:28 +0900 Subject: Make utils.mkfs() set label when fs=swap And add some tests for utils.mkfs() Change-Id: I6bf439f2076d401259f07aef26720cd0f7dac61e --- nova/tests/test_utils.py | 15 +++++++++++++++ 1 file changed, 15 insertions(+) (limited to 'nova/tests') 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') -- cgit