From: Jenkins <jenkins@review.openstack.org>
Date: Fri, 19 Feb 2016 23:33:51 +0000 (+0000)
Subject: Merge "Split out NestedQuotas into a separate driver"
X-Git-Url: https://review.fuel-infra.org/gitweb?a=commitdiff_plain;h=9285c99eae66d814dea966c276f2f9fa29e7db27;p=openstack-build%2Fcinder-build.git

Merge "Split out NestedQuotas into a separate driver"
---

9285c99eae66d814dea966c276f2f9fa29e7db27
diff --cc cinder/tests/unit/test_quota.py
index 9a1bee456,d90f10235..cebce9a29
--- a/cinder/tests/unit/test_quota.py
+++ b/cinder/tests/unit/test_quota.py
@@@ -888,16 -876,10 +879,16 @@@ class VolumeTypeQuotaEngineTestCase(tes
          db.volume_type_destroy(ctx, vtype['id'])
          db.volume_type_destroy(ctx, vtype2['id'])
  
 +    def test_update_quota_resource(self):
 +        ctx = context.RequestContext('admin', 'admin', is_admin=True)
 +
 +        engine = quota.VolumeTypeQuotaEngine()
 +        engine.update_quota_resource(ctx, 'type1', 'type2')
 +
  
- class DbQuotaDriverTestCase(test.TestCase):
+ class DbQuotaDriverBaseTestCase(test.TestCase):
      def setUp(self):
-         super(DbQuotaDriverTestCase, self).setUp()
+         super(DbQuotaDriverBaseTestCase, self).setUp()
  
          self.flags(quota_volumes=10,
                     quota_snapshots=10,