Skip to content

Commit b47787b

Browse files
authored
Merge pull request saltstack#55002 from aplanas/backport_52182
(Backport 52182) mdadm_raid: convert metadata to text
2 parents 576bd85 + 6cc6de2 commit b47787b

File tree

1 file changed

+37
-7
lines changed

1 file changed

+37
-7
lines changed

tests/unit/modules/test_mdadm_raid.py

+37-7
Original file line numberDiff line numberDiff line change
@@ -50,14 +50,44 @@ def test_create(self):
5050
'-C', '/dev/md0',
5151
'-R',
5252
'-v',
53-
'-l', '5',
54-
])
53+
'-l', '5'])
5554
self.assertEqual(args[0][10:], [
56-
'-e', 'default',
57-
'-n', '3',
58-
'/dev/sdb1', '/dev/sdc1', '/dev/sdd1'])
59-
self.assertEqual(sorted(args[0][7:10]), sorted(['--chunk', '256', '--force']))
60-
self.assertIn('--chunk 256', ' '.join(args[0][7:10]))
55+
'-e', 'default',
56+
'-n', '3',
57+
'/dev/sdb1', '/dev/sdc1', '/dev/sdd1'])
58+
self.assertEqual(sorted(args[0][7:10]),
59+
sorted(['--chunk', '256', '--force']))
60+
self.assertEqual(kwargs, {'python_shell': False})
61+
62+
def test_create_metadata(self):
63+
mock = MagicMock(return_value='salt')
64+
with patch.dict(mdadm.__salt__, {'cmd.run': mock}), \
65+
patch('salt.utils.path.which', lambda exe: exe):
66+
ret = mdadm.create(
67+
'/dev/md0', 5,
68+
devices=['/dev/sdb1', '/dev/sdc1', '/dev/sdd1'],
69+
metadata=0.9,
70+
test_mode=False,
71+
force=True,
72+
chunk=256
73+
)
74+
self.assertEqual('salt', ret)
75+
76+
self.assert_called_once(mock)
77+
78+
args, kwargs = mock.call_args
79+
self.assertEqual(args[0][:7], [
80+
'mdadm',
81+
'-C', '/dev/md0',
82+
'-R',
83+
'-v',
84+
'-l', '5'])
85+
self.assertEqual(args[0][10:], [
86+
'-e', '0.9',
87+
'-n', '3',
88+
'/dev/sdb1', '/dev/sdc1', '/dev/sdd1'])
89+
self.assertEqual(sorted(args[0][7:10]),
90+
sorted(['--chunk', '256', '--force']))
6191
self.assertEqual(kwargs, {'python_shell': False})
6292

6393
def test_create_test_mode(self):

0 commit comments

Comments
 (0)