From: Jenkins <jenkins@review.openstack.org>
Date: Fri, 25 Apr 2014 08:20:19 +0000 (+0000)
Subject: Merge "Replace tearDown with addCleanup - Part 4"
X-Git-Url: https://review.fuel-infra.org/gitweb?a=commitdiff_plain;h=4a392e658c6aa0b5574f26a270305150f521b130;p=openstack-build%2Fcinder-build.git

Merge "Replace tearDown with addCleanup - Part 4"
---

4a392e658c6aa0b5574f26a270305150f521b130
diff --cc cinder/tests/test_drivers_compatibility.py
index e538d8850,3d2cba7e0..f517679ac
--- a/cinder/tests/test_drivers_compatibility.py
+++ b/cinder/tests/test_drivers_compatibility.py
@@@ -39,10 -45,11 +39,7 @@@ class VolumeDriverCompatibility(test.Te
          self.manager = importutils.import_object(CONF.volume_manager)
          self.context = context.get_admin_context()
  
-     def tearDown(self):
-         super(VolumeDriverCompatibility, self).tearDown()
- 
      def _load_driver(self, driver):
 -        if 'SolidFire' in driver:
 -            # SolidFire driver does update_cluster stat on init
 -            self.stubs.Set(SolidFireDriver, '_update_cluster_status',
 -                           self.fake_update_cluster_status)
          self.manager.__init__(volume_driver=driver)
  
      def _driver_module_name(self):