Fix broken downburst unit tests

These were passing because we were calling Mock.assert_called_once(),
which never existed. In new versions of mock, that is an error -
exposing those tests which were not doing their job.

Signed-off-by: Zack Cerza <zack@redhat.com>

diff --git a/teuthology/test/test_provision.py b/teuthology/test/test_provision.py
index 3a6ff0c08f3bdcffcb57f64d34fdeb601906ae40..29259769f744e1f645a308fe122ad4a18ffc8b06 100644 (file)
--- a/teuthology/test/test_provision.py
+++ b/teuthology/test/test_provision.py
@@ -21,20 +21,20 @@ class TestDownburst(object):
         status = self.status
 
         dbrst = provision.Downburst(name, ctx.os_type, ctx.os_version, status)
-        dbrst.create = MagicMock(name='create')
-        dbrst.create.return_value = True
-        dbrst._run_create = MagicMock(name='_run_create')
-        dbrst._run_create.return_value = True
+        dbrst.executable = '/fake/path'
         dbrst.build_config = MagicMock(name='build_config')
-        dbrst.remove_config = MagicMock(name='remove_config')
+        dbrst._run_create = MagicMock(name='_run_create')
+        dbrst._run_create.return_value = (0, '', '')
+        remove_config = MagicMock(name='remove_config')
+        dbrst.remove_config = remove_config
 
         result = provision.create_if_vm(ctx, name, dbrst)
         assert result is True
 
-        dbrst.create.assert_called_once()
-        dbrst._run_create.assert_called_once()
-        dbrst.build_config.assert_called_once()
-        dbrst.remove_config.assert_called_once()
+        dbrst._run_create.assert_called_with()
+        dbrst.build_config.assert_called_with()
+        del dbrst
+        remove_config.assert_called_with()
 
     def test_destroy_if_vm_success(self):
         name = self.name
@@ -48,7 +48,7 @@ class TestDownburst(object):
         result = provision.destroy_if_vm(ctx, name, _downburst=dbrst)
         assert result is True
 
-        dbrst.destroy.assert_called_once()
+        dbrst.destroy.assert_called_with()
 
     def test_destroy_if_vm_wrong_owner(self):
         name = self.name
@@ -57,15 +57,12 @@ class TestDownburst(object):
         status['locked_by'] = 'user@a'
 
         dbrst = provision.Downburst(name, ctx.os_type, ctx.os_version, status)
-        dbrst.destroy = MagicMock(name='destroy')
-        dbrst.destroy.return_value = True
+        dbrst.destroy = MagicMock(name='destroy', side_effect=RuntimeError)
 
         result = provision.destroy_if_vm(ctx, name, user='user@b',
                                          _downburst=dbrst)
         assert result is False
 
-        dbrst.destroy.assert_called_once()
-
     def test_destroy_if_vm_wrong_description(self):
         name = self.name
         ctx = self.ctx
@@ -74,14 +71,12 @@ class TestDownburst(object):
 
         dbrst = provision.Downburst(name, ctx.os_type, ctx.os_version, status)
         dbrst.destroy = MagicMock(name='destroy')
-        dbrst.destroy.return_value = True
+        dbrst.destroy = MagicMock(name='destroy', side_effect=RuntimeError)
 
         result = provision.destroy_if_vm(ctx, name, description='desc_b',
                                          _downburst=dbrst)
         assert result is False
 
-        dbrst.destroy.assert_called_once()
-
     @patch('teuthology.provision.downburst_executable')
     def test_create_fails_without_executable(self, m_exec):
         name = self.name