Merge "hyper-v: mock time.sleep in test_rmtree"

openstack · Aug 29, 2015 · 9c700a9 · 9c700a9
2 parents 64a31ba + ec5879d
commit 9c700a9
Showing 1 changed file with 3 additions and 1 deletion.
diff --git a/nova/tests/unit/virt/hyperv/test_pathutils.py b/nova/tests/unit/virt/hyperv/test_pathutils.py
@@ -156,8 +156,9 @@ def test_soft_unmount_smb_share(self):
     def test_force_unmount_smb_share(self):
         self._test_unmount_smb_share(force=True)
 
+    @mock.patch('time.sleep')
     @mock.patch('shutil.rmtree')
-    def test_rmtree(self, mock_rmtree):
+    def test_rmtree(self, mock_rmtree, mock_sleep):
         class WindowsError(Exception):
             def __init__(self, winerror=None):
                 self.winerror = winerror
@@ -171,6 +172,7 @@ def __init__(self, winerror=None):
 
         mock_rmtree.assert_has_calls([mock.call(mock.sentinel.FAKE_PATH),
                                       mock.call(mock.sentinel.FAKE_PATH)])
+        mock_sleep.assert_called_once_with(1)
 
     @mock.patch('os.path.join')
     def test_get_instances_sub_dir(self, fake_path_join):