From 718b01b19d5b5da2ce9f67cfafebf54b9a12b1f7 Mon Sep 17 00:00:00 2001 From: Jacob Boddey Date: Tue, 7 May 2024 13:47:43 +0100 Subject: [PATCH] Fix some pylint issues --- framework/python/src/common/session.py | 2 +- framework/python/src/test_orc/test_orchestrator.py | 2 +- modules/test/tls/python/src/tls_module.py | 3 ++- testing/api/test_api.py | 2 +- testing/tests/test_tests.py | 3 ++- testing/unit/tls/tls_module_test.py | 3 ++- 6 files changed, 9 insertions(+), 6 deletions(-) diff --git a/framework/python/src/common/session.py b/framework/python/src/common/session.py index 09eef117e..df7a1c3b2 100644 --- a/framework/python/src/common/session.py +++ b/framework/python/src/common/session.py @@ -144,7 +144,7 @@ def _load_version(self, default_version): version_cmd = util.run_command( 'dpkg-query --showformat=\'${Version}\' --show testrun') # index 1 of response is the stderr byte stream so if - # it has any data in it, there was an error and we + # it has any data in it, there was an error and we # did not resolve the version and we'll use the fallback if len(version_cmd[1]) == 0: version = version_cmd[0] diff --git a/framework/python/src/test_orc/test_orchestrator.py b/framework/python/src/test_orc/test_orchestrator.py index 2b9d427cf..60ef78b41 100644 --- a/framework/python/src/test_orc/test_orchestrator.py +++ b/framework/python/src/test_orc/test_orchestrator.py @@ -198,7 +198,7 @@ def _cleanup_old_test_results(self, device): completed_tests = os.listdir(completed_results_dir) cur_test_count = len(completed_tests) if cur_test_count > max_device_reports: - LOGGER.debug("Current device has more than max tests results allowed: " + + LOGGER.debug("Current device has more than max results allowed: " + str(cur_test_count) + ">" + str(max_device_reports)) # Find and delete the oldest test diff --git a/modules/test/tls/python/src/tls_module.py b/modules/test/tls/python/src/tls_module.py index 98d6f25b1..353fc8777 100644 --- a/modules/test/tls/python/src/tls_module.py +++ b/modules/test/tls/python/src/tls_module.py @@ -119,7 +119,8 @@ def __init__(self, # # cert_table = (f'| Property | Value |\n' # # f'|---|---|\n' # # f"| {'Version':<17} | {version_value:^25} |\n" - # # f"| {'Signature Alg.':<17} | {signature_alg_value:^25} |\n" + # # f"| {'Signature Alg.':<17} | + # {signature_alg_value:^25} |\n" # # f"| {'Validity from':<17} | {not_before:^25} |\n" # # f"| {'Valid to':<17} | {not_after:^25} |") diff --git a/testing/api/test_api.py b/testing/api/test_api.py index f0e9ac51c..b5a4f7978 100644 --- a/testing/api/test_api.py +++ b/testing/api/test_api.py @@ -541,7 +541,7 @@ def test_multiple_runs(testing_devices, testrun): @pytest.mark.skip() def test_create_invalid_chars(empty_devices_dir, testrun): # local_delete_devices(ALL_DEVICES) - # We must start test run with no devices in local/devices for this test + # We must start test run with no devices in local/devices for this test # to function as expected! assert len(local_get_devices()) == 0 diff --git a/testing/tests/test_tests.py b/testing/tests/test_tests.py index 895b63ec0..6b6c03d4d 100644 --- a/testing/tests/test_tests.py +++ b/testing/tests/test_tests.py @@ -112,7 +112,8 @@ def test_list_tests(capsys, results, test_matrix): for test in collect_actual_results(results[tester]): if test.name in test_matrix[tester]['expected_results']: print( - f' {test.name}: {test.result} (exp: {test_matrix[tester]["expected_results"][test.name]})' + f''' {test.name}: {test.result} (exp: {test_matrix[ + tester]["expected_results"][test.name]})''' ) else: print(f' {test.name}: {test.result}') diff --git a/testing/unit/tls/tls_module_test.py b/testing/unit/tls/tls_module_test.py index 9a14d1ee5..e8c4afec4 100644 --- a/testing/unit/tls/tls_module_test.py +++ b/testing/unit/tls/tls_module_test.py @@ -476,7 +476,8 @@ def tls_module_ca_cert_spaces_test(self): cert_out_dir=OUTPUT_DIR, root_certs_dir=tmp_dir) - cert_valid = tls_util.validate_local_ca_signature(device_cert_path=cert_path) + cert_valid = tls_util.validate_local_ca_signature( + device_cert_path=cert_path) self.assertEqual(cert_valid[0], True)