Skip to content

Commit e2d7db5

Browse files
marcelmamulamarcelmamula
committed
remove patch.dict
1 parent a6e5d11 commit e2d7db5

6 files changed

Lines changed: 60 additions & 45 deletions

File tree

‎tests/unit/plugins/modules/test_sap_company.py‎

Lines changed: 9 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33
from __future__ import (absolute_import, division, print_function)
44
__metaclass__ = type
55

6+
import sys
67
from ansible_collections.community.sap_libs.tests.unit.compat.mock import patch, MagicMock
78
from ansible_collections.community.sap_libs.tests.unit.plugins.modules.utils import AnsibleExitJson, AnsibleFailJson, ModuleTestCase, set_module_args
89

@@ -11,13 +12,14 @@ class TestSAPRfcModule(ModuleTestCase):
1112

1213
def setUp(self):
1314
super(TestSAPRfcModule, self).setUp()
14-
self.pyrfc_mock = {
15-
'pyrfc': MagicMock(),
16-
'pyrfc.Connection': MagicMock()
17-
}
18-
patcher = patch.dict('sys.modules', self.pyrfc_mock)
19-
patcher.start()
20-
self.addCleanup(patcher.stop)
15+
sys.modules['pyrfc'] = MagicMock()
16+
sys.modules['pyrfc.Connection'] = MagicMock()
17+
18+
def cleanup_mocks():
19+
del sys.modules['pyrfc']
20+
del sys.modules['pyrfc.Connection']
21+
self.addCleanup(cleanup_mocks)
22+
2123
from ansible_collections.community.sap_libs.plugins.modules import sap_company
2224
self.module = sap_company
2325

‎tests/unit/plugins/modules/test_sap_control_exec.py‎

Lines changed: 11 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33
from __future__ import (absolute_import, division, print_function)
44
__metaclass__ = type
55

6+
import sys
67
from ansible_collections.community.sap_libs.tests.unit.compat.mock import patch, MagicMock, Mock
78
from ansible_collections.community.sap_libs.tests.unit.plugins.modules.utils import AnsibleExitJson, AnsibleFailJson, ModuleTestCase, set_module_args
89

@@ -11,14 +12,16 @@ class TestSapcontrolModule(ModuleTestCase):
1112

1213
def setUp(self):
1314
super(TestSapcontrolModule, self).setUp()
14-
self.suds_mock = {
15-
'suds.client': MagicMock(),
16-
'suds.sudsobject': MagicMock(),
17-
'suds': MagicMock()
18-
}
19-
patcher = patch.dict('sys.modules', self.suds_mock)
20-
patcher.start()
21-
self.addCleanup(patcher.stop)
15+
sys.modules['suds.client'] = MagicMock()
16+
sys.modules['suds.sudsobject'] = MagicMock()
17+
sys.modules['suds'] = MagicMock()
18+
19+
def cleanup_suds():
20+
del sys.modules['suds.client']
21+
del sys.modules['suds.sudsobject']
22+
del sys.modules['suds']
23+
self.addCleanup(cleanup_suds)
24+
2225
from ansible_collections.community.sap_libs.plugins.modules import sap_control_exec
2326
self.module = sap_control_exec
2427

‎tests/unit/plugins/modules/test_sap_pyrfc.py‎

Lines changed: 9 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@
1212

1313
__metaclass__ = type
1414

15+
import sys
1516
from ansible_collections.community.sap_libs.tests.unit.compat.mock import patch, MagicMock
1617
from ansible_collections.community.sap_libs.tests.unit.plugins.modules.utils import AnsibleExitJson, AnsibleFailJson, ModuleTestCase, set_module_args
1718

@@ -20,13 +21,14 @@ class TestSAPRfcModule(ModuleTestCase):
2021

2122
def setUp(self):
2223
super(TestSAPRfcModule, self).setUp()
23-
self.pyrfc_mock = {
24-
'pyrfc': MagicMock(),
25-
'pyrfc.Connection': MagicMock()
26-
}
27-
patcher = patch.dict('sys.modules', self.pyrfc_mock)
28-
patcher.start()
29-
self.addCleanup(patcher.stop)
24+
sys.modules['pyrfc'] = MagicMock()
25+
sys.modules['pyrfc.Connection'] = MagicMock()
26+
27+
def cleanup_mocks():
28+
del sys.modules['pyrfc']
29+
del sys.modules['pyrfc.Connection']
30+
self.addCleanup(cleanup_mocks)
31+
3032
from ansible_collections.community.sap_libs.plugins.modules import sap_pyrfc
3133
self.module = sap_pyrfc
3234

‎tests/unit/plugins/modules/test_sap_snote.py‎

Lines changed: 9 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33
from __future__ import (absolute_import, division, print_function)
44
__metaclass__ = type
55

6+
import sys
67
from ansible_collections.community.sap_libs.tests.unit.compat.mock import patch, MagicMock, Mock
78
from ansible_collections.community.sap_libs.tests.unit.plugins.modules.utils import AnsibleExitJson, AnsibleFailJson, ModuleTestCase, set_module_args
89

@@ -11,13 +12,14 @@ class TestSAPRfcModule(ModuleTestCase):
1112

1213
def setUp(self):
1314
super(TestSAPRfcModule, self).setUp()
14-
self.pyrfc_mock = {
15-
'pyrfc': MagicMock(),
16-
'pyrfc.Connection': MagicMock()
17-
}
18-
patcher = patch.dict('sys.modules', self.pyrfc_mock)
19-
patcher.start()
20-
self.addCleanup(patcher.stop)
15+
sys.modules['pyrfc'] = MagicMock()
16+
sys.modules['pyrfc.Connection'] = MagicMock()
17+
18+
def cleanup_mocks():
19+
del sys.modules['pyrfc']
20+
del sys.modules['pyrfc.Connection']
21+
self.addCleanup(cleanup_mocks)
22+
2123
from ansible_collections.community.sap_libs.plugins.modules import sap_snote
2224
self.module = sap_snote
2325

‎tests/unit/plugins/modules/test_sap_task_list_execute.py‎

Lines changed: 13 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33
from __future__ import (absolute_import, division, print_function)
44
__metaclass__ = type
55

6+
import sys
67
from ansible_collections.community.sap_libs.tests.unit.compat.mock import patch, MagicMock
78
from ansible_collections.community.sap_libs.tests.unit.plugins.modules.utils import AnsibleExitJson, AnsibleFailJson, ModuleTestCase, set_module_args
89

@@ -11,15 +12,18 @@ class TestSAPRfcModule(ModuleTestCase):
1112

1213
def setUp(self):
1314
super(TestSAPRfcModule, self).setUp()
14-
self.mock_modules = {
15-
'pyrfc': MagicMock(),
16-
'pyrfc.Connection': MagicMock(),
17-
'xmltodict': MagicMock(),
18-
'xmltodict.parse': MagicMock()
19-
}
20-
patcher = patch.dict('sys.modules', self.mock_modules)
21-
patcher.start()
22-
self.addCleanup(patcher.stop)
15+
sys.modules['pyrfc'] = MagicMock()
16+
sys.modules['pyrfc.Connection'] = MagicMock()
17+
sys.modules['xmltodict'] = MagicMock()
18+
sys.modules['xmltodict.parse'] = MagicMock()
19+
20+
def cleanup_mocks():
21+
del sys.modules['pyrfc']
22+
del sys.modules['pyrfc.Connection']
23+
del sys.modules['xmltodict']
24+
del sys.modules['xmltodict.parse']
25+
self.addCleanup(cleanup_mocks)
26+
2327
from ansible_collections.community.sap_libs.plugins.modules import sap_task_list_execute
2428
self.module = sap_task_list_execute
2529

‎tests/unit/plugins/modules/test_sap_user.py‎

Lines changed: 9 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33
from __future__ import (absolute_import, division, print_function)
44
__metaclass__ = type
55

6+
import sys
67
from ansible_collections.community.sap_libs.tests.unit.compat.mock import patch, MagicMock
78
from ansible_collections.community.sap_libs.tests.unit.plugins.modules.utils import AnsibleExitJson, AnsibleFailJson, ModuleTestCase, set_module_args
89

@@ -11,13 +12,14 @@ class TestSAPRfcModule(ModuleTestCase):
1112

1213
def setUp(self):
1314
super(TestSAPRfcModule, self).setUp()
14-
self.pyrfc_mock = {
15-
'pyrfc': MagicMock(),
16-
'pyrfc.Connection': MagicMock()
17-
}
18-
patcher = patch.dict('sys.modules', self.pyrfc_mock)
19-
patcher.start()
20-
self.addCleanup(patcher.stop)
15+
sys.modules['pyrfc'] = MagicMock()
16+
sys.modules['pyrfc.Connection'] = MagicMock()
17+
18+
def cleanup_mocks():
19+
del sys.modules['pyrfc']
20+
del sys.modules['pyrfc.Connection']
21+
self.addCleanup(cleanup_mocks)
22+
2123
from ansible_collections.community.sap_libs.plugins.modules import sap_user
2224
self.module = sap_user
2325

0 commit comments

Comments
 (0)