openstack
/
os-win
Code Issues Proposed changes

tests: Sets baseutils.BaseUtilsVirt._old_wmi 

There is a race condition between tests, and because
the _old_wmi is not set, it will try to load it, but since it
is mocked, it cannot, and it shouldn't.

Change-Id: Id029baf2e72f7b67eb6af3b3e66f998b902fd412
This commit is contained in:
Claudiu Belu 2017-06-23 02:52:11 -07:00
parent ff86810181
commit 8b0babf131
2 changed files with 3 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
os_win/tests/unit/test_base.py
View File

@ -19,6 +19,7 @@ from oslotest import base
from six.moves import builtins
from os_win import exceptions
from os_win.utils import baseutils
class TestingException(Exception):
@ -37,6 +38,7 @@ class OsWinBaseTestCase(base.BaseTestCase):
super(OsWinBaseTestCase, self).setUp()
self._mock_wmi = mock.MagicMock()
baseutils.BaseUtilsVirt._old_wmi = self._mock_wmi
mock_os = mock.MagicMock(Version='6.3.0')
self._mock_wmi.WMI.return_value.Win32_OperatingSystem.return_value = (

1
os_win/tests/unit/utils/test_baseutils.py
View File

@ -100,6 +100,7 @@ class BaseUtilsVirtTestCase(test_base.OsWinBaseTestCase):
@mock.patch.object(baseutils, 'imp')
@mock.patch.object(baseutils, 'wmi', create=True)
def test_vs_man_svc_2012(self, mock_wmi, mock_imp):
baseutils.BaseUtilsVirt._old_wmi = None
mock_os = mock.MagicMock(Version='6.2.0')
mock_wmi.WMI.return_value.Win32_OperatingSystem.return_value = [
mock_os]