Skip to content

Commit 6cf4c5d

Browse files
judysnggmarciani
andauthored
Unset proxies in test_runner (#6035)
* Unset proxies in test_runner Signed-off-by: Judy Ng <njud@amazon.com> * [Code Quality] Ignore bandit rules B036 and B038. Signed-off-by: Giacomo Marciani <mgiacomo@amazon.com> --------- Signed-off-by: Judy Ng <njud@amazon.com> Signed-off-by: Giacomo Marciani <mgiacomo@amazon.com> Co-authored-by: Giacomo Marciani <mgiacomo@amazon.com>
1 parent 4900b36 commit 6cf4c5d

File tree

5 files changed

+16
-5
lines changed

5 files changed

+16
-5
lines changed

cli/tests/pcluster/models/test_cluster_resources.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@ def test_initialization_success(self, mock_head_node, filters, expected_filters_
6262
logs_filters = ClusterLogsFiltersParser(mock_head_node, filters)
6363

6464
for attr in expected_attrs:
65-
assert_that(getattr(logs_filters, attr)).is_equal_to(expected_attrs.get(attr))
65+
assert_that(getattr(logs_filters, attr)).is_equal_to(expected_attrs.get(attr)) # noqa: B038
6666
assert_that(expected_filters_size).is_equal_to(len(logs_filters.filters_list))
6767

6868
@pytest.mark.parametrize(
@@ -149,7 +149,7 @@ def test_initialization_success(self, mock_head_node, params, expected_attrs):
149149
)
150150

151151
for attr in expected_attrs:
152-
assert_that(getattr(export_logs_filters, attr)).is_equal_to(expected_attrs.get(attr))
152+
assert_that(getattr(export_logs_filters, attr)).is_equal_to(expected_attrs.get(attr)) # noqa: B038
153153

154154
@pytest.mark.parametrize(
155155
"attrs, event_in_window, expected_error",

cli/tests/pcluster/models/test_common.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,7 @@ def test_initialization_success(self, params, expected_attrs):
7474
)
7575

7676
for attr in expected_attrs:
77-
assert_that(getattr(export_logs_filters, attr)).is_equal_to(expected_attrs.get(attr))
77+
assert_that(getattr(export_logs_filters, attr)).is_equal_to(expected_attrs.get(attr)) # noqa: B038
7878

7979
@pytest.mark.parametrize(
8080
"attrs, event_in_window, log_stream_prefix, expected_error",

tests/integration-tests/test_runner.py

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -762,6 +762,14 @@ def _check_args(args):
762762
raise argparse.ArgumentTypeError("'{0}' is not a valid test config".format(args.tests_config))
763763

764764

765+
def unset_proxies():
766+
"""Unset proxies"""
767+
os.environ.pop("HTTP_PROXY", None)
768+
os.environ.pop("HTTPS_PROXY", None)
769+
os.environ.pop("http_proxy", None)
770+
os.environ.pop("https_proxy", None)
771+
772+
765773
def _run_sequential(args):
766774
# Redirect stdout to file
767775
if not args.show_output:
@@ -788,6 +796,9 @@ def main():
788796
_check_args(args)
789797
logger.info("Parsed test_runner parameters {0}".format(args))
790798

799+
# Unset any proxies used to avoid network issues with tests, such as DCV
800+
unset_proxies()
801+
791802
_make_logging_dirs(args.output_dir)
792803

793804
if args.sequential:

tests/integration-tests/tests/performance_tests/plotting/performance_tests_plots.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ def generate_plots(datadir, outdir, configurations, nodes):
5050
# Box Plots
5151
box_plots = {}
5252
for configuration in configurations:
53-
positions = all_positions[configurations.index(configuration) :: n_configurations] # noqa: E203
53+
positions = all_positions[configurations.index(configuration) :: n_configurations] # noqa: E203, B038
5454
box_plots[configuration] = ax.boxplot(
5555
data[configuration],
5656
patch_artist=True,

tests/integration-tests/tests/storage/snapshots_factory.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -157,7 +157,7 @@ def _open_ssh_connection(self):
157157
)
158158
ssh_conn.open()
159159
tries = 0
160-
except BaseException:
160+
except BaseException: # noqa: B036
161161
logging.info("SSH connection error - retrying...")
162162
tries -= 1
163163
time.sleep(20)

0 commit comments

Comments
 (0)