VMware: fix broken mock of ds_util.mkdir

Change I788e33dbcb3dedc41831b976137607274b1c02ca introduced an
incorrect use of mock which had side-effects for other tests. This
change fixes it.

Change-Id: I71188ec7c12d51c2b4a253f13a5f51cc8bc0ae36

1 files changed, 6 insertions, 5 deletions

diff --git a/nova/tests/virt/vmwareapi/test_vmops.py b/nova/tests/virt/vmwareapi/test_vmops.py
index 2e8315a4c9..4ad27306f8 100644
--- a/nova/tests/virt/vmwareapi/test_vmops.py
+++ b/nova/tests/virt/vmwareapi/test_vmops.py
@@ -157,19 +157,20 @@ class VMwareVMOpsTestCase(test.NoDBTestCase):
                 name='fake-name',
                 vmFolder='fake-folder')
         path = ds_util.DatastorePath(ds_name, base_name)
-        ds_util.mkdir = mock.Mock()
         return ds_name, ds_ref, ops, path, dc_ref
 
-    def test_create_folder_if_missing(self):
+    @mock.patch.object(ds_util, 'mkdir')
+    def test_create_folder_if_missing(self, mock_mkdir):
         ds_name, ds_ref, ops, path, dc = self._setup_create_folder_mocks()
         ops._create_folder_if_missing(ds_name, ds_ref, 'folder')
-        ds_util.mkdir.assert_called_with(ops._session, path, dc)
+        mock_mkdir.assert_called_with(ops._session, path, dc)
 
-    def test_create_folder_if_missing_exception(self):
+    @mock.patch.object(ds_util, 'mkdir')
+    def test_create_folder_if_missing_exception(self, mock_mkdir):
         ds_name, ds_ref, ops, path, dc = self._setup_create_folder_mocks()
         ds_util.mkdir.side_effect = vexc.FileAlreadyExistsException()
         ops._create_folder_if_missing(ds_name, ds_ref, 'folder')
-        ds_util.mkdir.assert_called_with(ops._session, path, dc)
+        mock_mkdir.assert_called_with(ops._session, path, dc)
 
     @mock.patch.object(ds_util, 'file_exists', return_value=True)
     def test_check_if_folder_file_exists_with_existing(self,