Merge "Replace tearDown with addCleanup - Part 2"

diff --cc cinder/tests/image/test_glance.py
Simple merge

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

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

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

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

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

diff --cc cinder/tests/test_windows.py
index 524a4d02e95623941fbef76ff3ad0c80eadd3169,7108a2f81e15b7ec4d12e5f661f4fcdddcfc9568..8568eef9933826971c3f77f65f7df2494c9dd30c
--- 1/cinder/tests/test_windows.py
--- 2/cinder/tests/test_windows.py
+++ b/cinder/tests/test_windows.py
@@@ -74,17 -66,16 +66,16 @@@ class TestWindowsDriver(test.TestCase)
          windows_utils.WindowsUtils.__init__ = fake_wutils__init__
  
      def fake_local_path(self, volume):
 -            return os.path.join(CONF.windows_iscsi_lun_path,
 -                                str(volume['name']) + ".vhd")
 +        return os.path.join(CONF.windows_iscsi_lun_path,
 +                            str(volume['name']) + ".vhd")
  
      def test_check_for_setup_errors(self):
-         mox = self._mox
          drv = self._driver
-         self._mox.StubOutWithMock(windows_utils.WindowsUtils,
-                                   'check_for_setup_error')
+         self.mox.StubOutWithMock(windows_utils.WindowsUtils,
+                                  'check_for_setup_error')
          windows_utils.WindowsUtils.check_for_setup_error()
  
-         mox.ReplayAll()
+         self.mox.ReplayAll()
  
          drv.check_for_setup_error()