Merge "Cleanup for cinder tests with ConsistencyGroups"

diff --cc cinder/tests/unit/api/contrib/test_consistencygroups.py
index 84f4cce45faa8b89c0309280992f8f65bf7456a4,680ae17ccd0c3fc8c13fb604887ab4534eaacde2..f37164585e6ac48fb3ffc1a464d3591ab5c3fdc1
--- 1/cinder/tests/unit/api/contrib/test_consistencygroups.py
--- 2/cinder/tests/unit/api/contrib/test_consistencygroups.py
+++ b/cinder/tests/unit/api/contrib/test_consistencygroups.py
@@@ -622,8 -602,10 +602,8 @@@ class ConsistencyGroupsAPITestCase(test
  
          self.assertEqual(400, res.status_int)
          self.assertEqual(400, res_dict['badRequest']['code'])
 -        self.assertEqual('Name has a minimum character requirement of 1.',
 -                         res_dict['badRequest']['message'])
  
-         db.consistencygroup_destroy(ctxt.elevated(), consistencygroup_id)
+         consistencygroup.destroy()
  
      def test_update_consistencygroup_add_volume_invalid_state(self):
          volume_type_id = '123456'

diff --cc cinder/tests/unit/test_storwize_svc.py
Simple merge