From: Jenkins <jenkins@review.openstack.org>
Date: Tue, 18 Aug 2015 00:12:26 +0000 (+0000)
Subject: Merge "Cleanup for cinder tests with ConsistencyGroups"
X-Git-Url: https://review.fuel-infra.org/gitweb?a=commitdiff_plain;h=5a47eecd0e138948123cfef2a82a4827d6c3747d;p=openstack-build%2Fcinder-build.git

Merge "Cleanup for cinder tests with ConsistencyGroups"
---

5a47eecd0e138948123cfef2a82a4827d6c3747d
diff --cc cinder/tests/unit/api/contrib/test_consistencygroups.py
index 84f4cce45,680ae17cc..f37164585
--- a/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'