mirror of
https://github.com/ansible-collections/community.general.git
synced 2026-04-14 07:55:05 +00:00
Address issues reported by ruff check (#11043)
* Resolve E713 and E714 (not in/is tests). * Address UP018 (unnecessary str call). * UP045 requires Python 3.10+. * Address UP007 (X | Y for type annotations). * Address UP035 (import Callable from collections.abc). * Address UP006 (t.Dict -> dict). * Address UP009 (UTF-8 encoding comment). * Address UP034 (extraneous parantheses). * Address SIM910 (dict.get() with None default). * Address F401 (unused import). * Address UP020 (use builtin open). * Address B009 and B010 (getattr/setattr with constant name). * Address SIM300 (Yoda conditions). * UP029 isn't in use anyway. * Address FLY002 (static join). * Address B034 (re.sub positional args). * Address B020 (loop variable overrides input). * Address B017 (assert raise Exception). * Address SIM211 (if expression with false/true). * Address SIM113 (enumerate for loop). * Address UP036 (sys.version_info checks). * Remove unnecessary UP039. * Address SIM201 (not ==). * Address SIM212 (if expr with twisted arms). * Add changelog fragment. * Reformat.
This commit is contained in:
parent
f5943201b9
commit
3478863ef0
77 changed files with 196 additions and 222 deletions
|
|
@ -47,7 +47,7 @@ class OneViewBaseTest:
|
|||
def test_main_function_should_call_run_method(self, testing_module, mock_ansible_module):
|
||||
mock_ansible_module.params = {"config": "config.json"}
|
||||
|
||||
main_func = getattr(testing_module, "main")
|
||||
main_func = testing_module.main
|
||||
|
||||
with patch.object(self.testing_class, "run") as mock_run:
|
||||
main_func()
|
||||
|
|
@ -125,7 +125,7 @@ class OneViewBaseTestCase:
|
|||
def test_main_function_should_call_run_method(self):
|
||||
self.mock_ansible_module.params = {"config": "config.json"}
|
||||
|
||||
main_func = getattr(self.testing_module, "main")
|
||||
main_func = self.testing_module.main
|
||||
|
||||
with patch.object(self.testing_class, "run") as mock_run:
|
||||
main_func()
|
||||
|
|
|
|||
|
|
@ -11,7 +11,6 @@ from ansible_collections.community.general.plugins.modules import interfaces_fil
|
|||
from shutil import copyfile, move
|
||||
import difflib
|
||||
import inspect
|
||||
import io
|
||||
import json
|
||||
import os
|
||||
import re
|
||||
|
|
@ -81,7 +80,7 @@ class TestInterfacesFileModule(unittest.TestCase):
|
|||
goldenstring = string
|
||||
goldenData = ifaces
|
||||
if not os.path.isfile(testfilepath):
|
||||
with io.open(testfilepath, "wb") as f:
|
||||
with open(testfilepath, "wb") as f:
|
||||
f.write(string.encode())
|
||||
else:
|
||||
with open(testfilepath, "r") as goldenfile:
|
||||
|
|
@ -94,7 +93,7 @@ class TestInterfacesFileModule(unittest.TestCase):
|
|||
string += "\n"
|
||||
goldenstring = string
|
||||
if not os.path.isfile(testfilepath):
|
||||
f = io.open(testfilepath, "wb")
|
||||
f = open(testfilepath, "wb")
|
||||
f.write(string.encode())
|
||||
f.close()
|
||||
else:
|
||||
|
|
|
|||
|
|
@ -12,17 +12,8 @@ from unittest.mock import (
|
|||
mock_open,
|
||||
)
|
||||
|
||||
import builtins
|
||||
import json
|
||||
import sys
|
||||
|
||||
if sys.version_info[0] == 3:
|
||||
import builtins
|
||||
|
||||
open_path = "builtins.open"
|
||||
else:
|
||||
import __builtin__ as builtins
|
||||
|
||||
open_path = "__builtin__.open"
|
||||
|
||||
|
||||
def test_validate_file_exist_passes_when_file_exists():
|
||||
|
|
@ -251,7 +242,7 @@ def test_read_privateKey_returns_trimmed_contents():
|
|||
module.params = {"private_key_path": "/fake/path/key.pem"}
|
||||
|
||||
mocked_file = mock_open(read_data="\n \t -----BEGIN PRIVATE KEY-----\nKEYDATA\n-----END PRIVATE KEY----- \n\n")
|
||||
with patch(open_path, mocked_file):
|
||||
with patch("builtins.open", mocked_file):
|
||||
result = jenkins_credential.read_privateKey(module)
|
||||
|
||||
expected = "-----BEGIN PRIVATE KEY-----\nKEYDATA\n-----END PRIVATE KEY-----"
|
||||
|
|
@ -264,7 +255,7 @@ def test_read_privateKey_handles_file_read_error():
|
|||
module = MagicMock()
|
||||
module.params = {"private_key_path": "/invalid/path.pem"}
|
||||
|
||||
with patch(open_path, side_effect=IOError("cannot read file")):
|
||||
with patch("builtins.open", side_effect=IOError("cannot read file")):
|
||||
jenkins_credential.read_privateKey(module)
|
||||
|
||||
module.fail_json.assert_called_once()
|
||||
|
|
@ -295,7 +286,7 @@ def test_embed_file_into_body_fails_when_file_unreadable():
|
|||
file_path = "/fake/path/missing.pem"
|
||||
credentials = {"id": "something"}
|
||||
|
||||
with patch(open_path, side_effect=IOError("can't read file")):
|
||||
with patch("builtins.open", side_effect=IOError("can't read file")):
|
||||
jenkins_credential.embed_file_into_body(module, file_path, credentials)
|
||||
|
||||
module.fail_json.assert_called_once()
|
||||
|
|
@ -307,7 +298,7 @@ def test_embed_file_into_body_injects_file_keys_into_credentials():
|
|||
file_path = "/fake/path/file.txt"
|
||||
credentials = {"id": "test"}
|
||||
|
||||
with patch(open_path, mock_open(read_data=b"1234")), patch("os.path.basename", return_value="file.txt"):
|
||||
with patch("builtins.open", mock_open(read_data=b"1234")), patch("os.path.basename", return_value="file.txt"):
|
||||
jenkins_credential.embed_file_into_body(module, file_path, credentials)
|
||||
|
||||
assert credentials["file"] == "file0"
|
||||
|
|
|
|||
|
|
@ -4,7 +4,6 @@
|
|||
|
||||
from __future__ import annotations
|
||||
|
||||
import sys
|
||||
from unittest.mock import patch
|
||||
|
||||
from ansible.module_utils.common.dict_transformations import dict_merge
|
||||
|
|
@ -30,10 +29,6 @@ class TestPritunlOrg(ModuleTestCase):
|
|||
super().setUp()
|
||||
self.module = pritunl_org
|
||||
|
||||
# Add backward compatibility
|
||||
if sys.version_info < (3, 2):
|
||||
self.assertRegex = self.assertRegexpMatches
|
||||
|
||||
def tearDown(self):
|
||||
super().tearDown()
|
||||
|
||||
|
|
|
|||
|
|
@ -4,7 +4,6 @@
|
|||
|
||||
from __future__ import annotations
|
||||
|
||||
import sys
|
||||
from unittest.mock import patch
|
||||
|
||||
from ansible_collections.community.general.plugins.modules import (
|
||||
|
|
@ -27,10 +26,6 @@ class TestPritunlOrgInfo(ModuleTestCase):
|
|||
super().setUp()
|
||||
self.module = pritunl_org_info
|
||||
|
||||
# Add backward compatibility
|
||||
if sys.version_info < (3, 2):
|
||||
self.assertRegex = self.assertRegexpMatches
|
||||
|
||||
def tearDown(self):
|
||||
super().tearDown()
|
||||
|
||||
|
|
|
|||
|
|
@ -4,7 +4,6 @@
|
|||
|
||||
from __future__ import annotations
|
||||
|
||||
import sys
|
||||
from unittest.mock import patch
|
||||
|
||||
from ansible.module_utils.common.dict_transformations import dict_merge
|
||||
|
|
@ -42,10 +41,6 @@ class TestPritunlUser(ModuleTestCase):
|
|||
super().setUp()
|
||||
self.module = pritunl_user
|
||||
|
||||
# Add backward compatibility
|
||||
if sys.version_info < (3, 2):
|
||||
self.assertRegex = self.assertRegexpMatches
|
||||
|
||||
def tearDown(self):
|
||||
super().tearDown()
|
||||
|
||||
|
|
|
|||
|
|
@ -4,7 +4,6 @@
|
|||
|
||||
from __future__ import annotations
|
||||
|
||||
import sys
|
||||
from unittest.mock import patch
|
||||
|
||||
from ansible_collections.community.general.plugins.modules import (
|
||||
|
|
@ -27,10 +26,6 @@ class TestPritunlUserInfo(ModuleTestCase):
|
|||
super().setUp()
|
||||
self.module = pritunl_user_info
|
||||
|
||||
# Add backward compatibility
|
||||
if sys.version_info < (3, 2):
|
||||
self.assertRegex = self.assertRegexpMatches
|
||||
|
||||
def tearDown(self):
|
||||
super().tearDown()
|
||||
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue