summaryrefslogtreecommitdiff
path: root/test/units/module_utils
diff options
context:
space:
mode:
authorRick Elrod <rick@elrod.me>2020-01-26 03:16:16 -0600
committerMatt Clay <matt@mystile.com>2020-01-29 13:29:40 -0800
commite2a57414f4008fe3092c231b8f39b1adefc1c16f (patch)
tree474e07870facffe55b2a96346e5357d85460d860 /test/units/module_utils
parent1156962cded3cfed8b40a23b841415811fb24cba (diff)
downloadansible-e2a57414f4008fe3092c231b8f39b1adefc1c16f.tar.gz
Remove `with` statement for pytest-mock unit tests
As per: https://github.com/pytest-dev/pytest-mock#note-about-usage-as-context-manager pytest-mock is not meant to be used within a `with` context or as a decorator. Instead, pytest-mock will automatically unpatch the mocked methods when each test is complete. In newer pytest-mock, this use actually throws an exception and causes the tests to fail. This hasn't been hit in Ansible's CI yet, because the docker image that the tests run in uses an older version of pytest-mock. However, there is no constraint on the upper bound of pytest-mock in test/lib/ansible_test/_data/requirements/constraints.txt which means that when running the tests locally, outside of that docker image, the tests never pass. This patch removes the `with` context in each such case. Signed-off-by: Rick Elrod <rick@elrod.me>
Diffstat (limited to 'test/units/module_utils')
-rw-r--r--test/units/module_utils/facts/hardware/test_sunos_get_uptime_facts.py8
1 files changed, 4 insertions, 4 deletions
diff --git a/test/units/module_utils/facts/hardware/test_sunos_get_uptime_facts.py b/test/units/module_utils/facts/hardware/test_sunos_get_uptime_facts.py
index 1c852babaa..43ae726761 100644
--- a/test/units/module_utils/facts/hardware/test_sunos_get_uptime_facts.py
+++ b/test/units/module_utils/facts/hardware/test_sunos_get_uptime_facts.py
@@ -11,7 +11,7 @@ def test_sunos_get_uptime_facts(mocker):
inst = sunos.SunOSHardware(module)
- with mocker.patch('time.time', return_value=1567052602.5089788):
- expected = int(time.time()) - 1548249689
- result = inst.get_uptime_facts()
- assert expected == result['uptime_seconds']
+ mocker.patch('time.time', return_value=1567052602.5089788)
+ expected = int(time.time()) - 1548249689
+ result = inst.get_uptime_facts()
+ assert expected == result['uptime_seconds']