Ubuntu Pastebin

Paste from smoser at Wed, 17 May 2017 18:37:48 +0000

Download as text
 1
 2
 3
 4
 5
 6
 7
 8
 9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
diff --git a/tests/unittests/test_handler/test_handler_disk_setup.py b/tests/unittests/test_handler/test_handler_disk_setup.py
index 9f00d46a..6574bbea 100644
--- a/tests/unittests/test_handler/test_handler_disk_setup.py
+++ b/tests/unittests/test_handler/test_handler_disk_setup.py
@@ -186,9 +186,11 @@ class TestMkfsCommandHandling(TestCase):
         subp.assert_called_once_with(
             'mkfs -t ext4 -L with_cmd /dev/xdb1', shell=True)
 
-    def test_overwrite_and_extra_opts_without_cmd(self, subp, *args):
+    @mock.patch('cloudinit.config.cc_disk_setup.util.which')
+    def test_overwrite_and_extra_opts_without_cmd(self, m_which, subp, *args):
         """mkfs observes extra_opts and overwrite settings when cmd is not
         present."""
+        m_which.side_effect = lambda p: {'mkfs.ext4': '/sbin/mkfs.ext4'}[p]
         cc_disk_setup.mkfs({
             'filesystem': 'ext4',
             'device': '/dev/xdb1',
@@ -197,6 +199,7 @@ class TestMkfsCommandHandling(TestCase):
             'overwrite': True
         })
 
+        print(subp)
         subp.assert_called_once_with(
             ['/sbin/mkfs.ext4', '/dev/xdb1',
              '-L', 'without_cmd', '-F', 'are', 'added'],
Download as text