From 502b340553e2841ece248c3db57df87a73f43630 Mon Sep 17 00:00:00 2001 From: Nitin Madhok Date: Wed, 17 Dec 2014 13:46:34 -0500 Subject: [PATCH] Fixing unit tests for mdadm --- tests/unit/modules/mdadm_test.py | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/tests/unit/modules/mdadm_test.py b/tests/unit/modules/mdadm_test.py index 75f8b108be..2859a145ae 100644 --- a/tests/unit/modules/mdadm_test.py +++ b/tests/unit/modules/mdadm_test.py @@ -28,34 +28,34 @@ class MdadmTestCase(TestCase): with patch.dict(mdadm.__salt__, {'cmd.run': mock}): ret = mdadm.create( '/dev/md0', 5, - ['/dev/sdb1', + devices="['/dev/sdb1', '/dev/sdc1', - '/dev/sdd1'], + '/dev/sdd1']", test_mode=False, force=True, chunk=256 ) self.assertEqual('salt', ret) mock.assert_called_once_with( - ['mdadm', '-C', '/dev/md0', '-v', '--chunk', 256, '--force', - '-l', 5, '-e', 'default', '-n', 3, '/dev/sdb1', '/dev/sdc1', - '/dev/sdd1'], python_shell=False) + 'mdadm -C /dev/md0 -v --chunk 256 --force + -l 5 -e default -n 3 /dev/sdb1 /dev/sdc1 + /dev/sdd1', python_shell=False) def test_create_test_mode(self): mock = MagicMock() with patch.dict(mdadm.__salt__, {'cmd.run': mock}): ret = mdadm.create( '/dev/md0', 5, - ['/dev/sdb1', + devices="['/dev/sdb1', '/dev/sdc1', - '/dev/sdd1'], + '/dev/sdd1']", force=True, chunk=256, test_mode=True ) - self.assertEqual(['mdadm', '-C', '/dev/md0', '-v', '--chunk', 256, - '--force', '-l', 5, '-e', 'default', '-n', 3, - '/dev/sdb1', '/dev/sdc1', '/dev/sdd1'], ret) + self.assertEqual(['mdadm -C /dev/md0 -v --chunk 256 ' + '--force -l 5 -e default -n 3 ' + '/dev/sdb1 /dev/sdc1 /dev/sdd1'], ret) assert not mock.called, 'test mode failed, cmd.run called' if __name__ == '__main__':