From: John Griffith <john.griffith@solidfire.com>
Date: Fri, 22 Aug 2014 17:52:36 +0000 (-0600)
Subject: Fix duplicate teardown to allow tox upgrade
X-Git-Url: https://review.fuel-infra.org/gitweb?a=commitdiff_plain;h=74a38b5e7ea69f9730845e71c34fafdb7733c60b;p=openstack-build%2Fcinder-build.git

Fix duplicate teardown to allow tox upgrade

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
---

diff --git a/cinder/tests/test_hds_nfs.py b/cinder/tests/test_hds_nfs.py
index c34318ec1..168dc8b6d 100644
--- a/cinder/tests/test_hds_nfs.py
+++ b/cinder/tests/test_hds_nfs.py
@@ -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')