Check for error messages in volume tests

Add assertions about messages of raised exceptions for Volume resources. Change-Id: Ied0e5ba25f465a6b7ad21c995ad08ea2300c91ff
openstack · Aug 27, 2014 · 3b972af · 3b972af
1 parent db5ec8b
commit 3b972af
Showing 1 changed file with 19 additions and 8 deletions.
diff --git a/heat/tests/test_volume.py b/heat/tests/test_volume.py
@@ -211,8 +211,9 @@ def test_volume(self):
         self.assertEqual('available', fv.status)
 
         fv.status = 'in-use'
-        self.assertRaises(exception.ResourceFailure,
-                          scheduler.TaskRunner(rsrc.destroy))
+        ex = self.assertRaises(exception.ResourceFailure,
+                               scheduler.TaskRunner(rsrc.destroy))
+        self.assertIn("Volume in use", six.text_type(ex))
 
         self._stubout_delete_volume(fv)
         fv.status = 'available'
@@ -270,6 +271,7 @@ def test_volume_default_az(self):
     def test_volume_create_error(self):
         fv = FakeVolume('creating', 'error')
         stack_name = 'test_volume_create_error_stack'
+        cfg.CONF.set_override('action_retry_limit', 0)
 
         self._mock_create_volume(fv, stack_name)
 
@@ -284,7 +286,9 @@ def test_volume_create_error(self):
                           resource_defns['DataVolume'],
                           stack)
         create = scheduler.TaskRunner(rsrc.create)
-        self.assertRaises(exception.ResourceFailure, create)
+        ex = self.assertRaises(exception.ResourceFailure, create)
+        self.assertIn('Went to status error due to "Unknown"',
+                      six.text_type(ex))
 
         self.m.VerifyAll()
 
@@ -297,7 +301,8 @@ def test_volume_bad_tags(self):
         rsrc = vol.Volume('DataVolume',
                           resource_defns['DataVolume'],
                           stack)
-        self.assertRaises(exception.StackValidationFailed, rsrc.validate)
+        ex = self.assertRaises(exception.StackValidationFailed, rsrc.validate)
+        self.assertIn('Tags Property error', six.text_type(ex))
 
         self.m.VerifyAll()
 
@@ -776,8 +781,9 @@ def test_snapshot_error(self):
 
         rsrc = self.create_volume(t, stack, 'DataVolume')
 
-        self.assertRaises(exception.ResourceFailure,
-                          scheduler.TaskRunner(rsrc.destroy))
+        ex = self.assertRaises(exception.ResourceFailure,
+                               scheduler.TaskRunner(rsrc.destroy))
+        self.assertIn('Unknown status error', six.text_type(ex))
 
         self.m.VerifyAll()
 
@@ -803,7 +809,9 @@ def test_snapshot_no_volume(self):
                           stack)
 
         create = scheduler.TaskRunner(rsrc.create)
-        self.assertRaises(exception.ResourceFailure, create)
+        ex = self.assertRaises(exception.ResourceFailure, create)
+        self.assertIn('Went to status error due to "Unknown"',
+                      six.text_type(ex))
 
         self._stubout_delete_volume(fv)
         scheduler.TaskRunner(rsrc.destroy)()
@@ -840,6 +848,7 @@ def test_create_from_snapshot(self):
 
     def test_create_from_snapshot_error(self):
         stack_name = 'test_volume_stack'
+        cfg.CONF.set_override('action_retry_limit', 0)
         fv = FakeVolumeWithStateTransition('restoring-backup', 'error')
         fvbr = FakeBackupRestore('vol-123')
 
@@ -867,7 +876,9 @@ def test_create_from_snapshot_error(self):
                           resource_defns['DataVolume'],
                           stack)
         create = scheduler.TaskRunner(rsrc.create)
-        self.assertRaises(exception.ResourceFailure, create)
+        ex = self.assertRaises(exception.ResourceFailure, create)
+        self.assertIn('Went to status error due to "Unknown"',
+                      six.text_type(ex))
 
         self.m.VerifyAll()