From: Jenkins <jenkins@review.openstack.org>
Date: Sun, 2 Mar 2014 01:25:39 +0000 (+0000)
Subject: Merge "Give a way to save why a service has been disabled"
X-Git-Url: https://review.fuel-infra.org/gitweb?a=commitdiff_plain;h=6c346e848a7a959c48c2d82169446a8ae91a371f;p=openstack-build%2Fcinder-build.git

Merge "Give a way to save why a service has been disabled"
---

6c346e848a7a959c48c2d82169446a8ae91a371f
diff --cc cinder/tests/api/contrib/test_services.py
index 9b10d1b37,fbabf65a0..ce9a38a0f
--- a/cinder/tests/api/contrib/test_services.py
+++ b/cinder/tests/api/contrib/test_services.py
@@@ -138,8 -145,13 +145,10 @@@ class ServicesTest(test.TestCase)
          self.stubs.Set(policy, "enforce", fake_policy_enforce)
  
          self.context = context.get_admin_context()
-         self.controller = services.ServiceController()
+         self.ext_mgr = extensions.ExtensionManager()
+         self.ext_mgr.extensions = {}
+         self.controller = services.ServiceController(self.ext_mgr)
  
 -    def tearDown(self):
 -        super(ServicesTest, self).tearDown()
 -
      def test_services_list(self):
          req = FakeRequest()
          res_dict = self.controller.index(req)