Merge "Replace tearDown with addCleanup - Part 4"

diff --cc cinder/tests/api/v1/test_volumes.py
Simple merge

diff --cc cinder/tests/test_backup.py
Simple merge

diff --cc cinder/tests/test_drivers_compatibility.py
index e538d88505a01f7267173737ccc273acb095b433,3d2cba7e033a25ba4cfef077b9e132c8ce404562..f517679acd7a81c9cf320b1fcc412d48a64e98cb
--- 1/cinder/tests/test_drivers_compatibility.py
--- 2/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):