]> review.fuel-infra Code Review - openstack-build/cinder-build.git/commitdiff
Fix duplicate teardown to allow tox upgrade
authorJohn Griffith <john.griffith@solidfire.com>
Fri, 22 Aug 2014 17:52:36 +0000 (11:52 -0600)
committerJohn Griffith <john.griffith@solidfire.com>
Fri, 22 Aug 2014 17:54:28 +0000 (11:54 -0600)
When trying to use tox 1.7.2 we run into a second
tearDown call being made in the test as opposed to
just using Super's version of it.

This removes that call and seems to get everything
working under tox 1.7.2

Change-Id: I0a2674b7c1ba9589cab5e3b76777fce23b6601ad
Partial-Bug: 1348818

cinder/tests/test_hds_nfs.py

index c34318ec106849caabf5bd160ab2188cf30d52da..168dc8b6d1556fd36d3251a590ae406ff6d593e9 100644 (file)
@@ -131,7 +131,6 @@ class HDSNFSDriverTest(test.TestCase):
     def _clean(self):
         os.remove(self.config_file)
         os.remove(self.shares_file)
-        super(HDSNFSDriverTest, self).tearDown()
 
     @mock.patch.object(nfs.HDSNFSDriver, '_id_to_vol')
     @mock.patch.object(nfs.HDSNFSDriver, '_get_provider_location')