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

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

d756766ff108b600b887fccf60a8623e32f26f25
diff --cc cinder/tests/test_windows.py
index 524a4d02e,7108a2f81..8568eef99
--- a/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()