remove used vars via pre commit

Jim Ryan · Jim Ryan · commit c6d7e88c46f5 · 2024-06-26T14:00:09.000+01:00
diff --git a/perf-tests/suite/ap_request_perf.py b/perf-tests/suite/ap_request_perf.py
@@ -1,7 +1,7 @@
 import os
 
 import yaml
-from locust import HttpUser, TaskSet, task
+from locust import HttpUser, task
 
 host = ""
 
diff --git a/perf-tests/suite/test_ap_reload_perf.py b/perf-tests/suite/test_ap_reload_perf.py
@@ -1,5 +1,4 @@
 import json
-import logging
 import os
 import re
 import subprocess
@@ -9,7 +8,7 @@
 import requests
 import yaml
 from kubernetes.client import V1ContainerPort
-from settings import DEPLOYMENTS, TEST_DATA
+from settings import TEST_DATA
 from suite.utils.ap_resources_utils import (
     create_ap_logconf_from_yaml,
     create_ap_policy_from_yaml,
@@ -25,14 +24,9 @@
     delete_items_from_yaml,
     ensure_connection_to_public_endpoint,
     ensure_response_from_backend,
-    get_events,
-    get_file_contents,
-    get_first_pod_name,
-    get_ingress_nginx_template_conf,
     get_resource_metrics,
     replace_ingress_with_ap_annotations,
     wait_before_test,
-    wait_for_event_increment,
     wait_until_all_pods_are_ready,
 )
 from suite.utils.yaml_utils import get_first_ingress_host_from_yaml
diff --git a/perf-tests/suite/test_vs_perf.py b/perf-tests/suite/test_vs_perf.py
@@ -1,7 +1,4 @@
 import json
-import re
-import subprocess
-from datetime import datetime
 
 import pytest
 import requests
diff --git a/tests/suite/test_app_protect_integration.py b/tests/suite/test_app_protect_integration.py
@@ -1,7 +1,7 @@
 import pytest
 import requests
 import yaml
-from settings import CRDS, DEPLOYMENTS, TEST_DATA
+from settings import CRDS, TEST_DATA
 from suite.utils.ap_resources_utils import (
     create_ap_logconf_from_yaml,
     create_ap_policy_from_yaml,
diff --git a/tests/suite/test_default_server.py b/tests/suite/test_default_server.py
@@ -3,7 +3,7 @@
 import pytest
 import requests
 from requests.exceptions import ConnectionError
-from settings import BASEDIR, DEPLOYMENTS, TEST_DATA
+from settings import TEST_DATA
 from suite.utils.resources_utils import (
     create_secret_from_yaml,
     delete_secret,
diff --git a/tests/suite/test_egress_mtls.py b/tests/suite/test_egress_mtls.py
@@ -1,16 +1,9 @@
 import pytest
-import requests
 from settings import TEST_DATA
 from suite.utils.policy_resources_utils import create_policy_from_yaml, delete_policy
 from suite.utils.resources_utils import create_secret_from_yaml, delete_secret, wait_before_test
 from suite.utils.ssl_utils import create_sni_session
-from suite.utils.vs_vsr_resources_utils import (
-    delete_and_create_vs_from_yaml,
-    patch_v_s_route_from_yaml,
-    patch_virtual_server_from_yaml,
-    read_vs,
-    read_vsr,
-)
+from suite.utils.vs_vsr_resources_utils import delete_and_create_vs_from_yaml, patch_virtual_server_from_yaml, read_vs
 
 std_vs_src = f"{TEST_DATA}/virtual-server/standard/virtual-server.yaml"
 std_vsr_src = f"{TEST_DATA}/virtual-server-route/route-multiple.yaml"
diff --git a/tests/suite/test_jwt_policies_jwksuri.py b/tests/suite/test_jwt_policies_jwksuri.py
@@ -9,7 +9,6 @@
     create_virtual_server_from_yaml,
     delete_and_create_vs_from_yaml,
     delete_virtual_server,
-    patch_v_s_route_from_yaml,
 )
 
 std_vs_src = f"{TEST_DATA}/virtual-server/standard/virtual-server.yaml"
diff --git a/tests/suite/test_rl_ingress.py b/tests/suite/test_rl_ingress.py
@@ -2,11 +2,8 @@
 
 import pytest
 import requests
-import yaml
-from kubernetes.client import NetworkingV1Api
-from settings import DEPLOYMENTS, TEST_DATA
+from settings import TEST_DATA
 from suite.fixtures.fixtures import PublicEndpoint
-from suite.utils.custom_assertions import assert_event_count_increased
 from suite.utils.resources_utils import (
     are_all_pods_in_ready_state,
     create_example_app,
diff --git a/tests/suite/test_rl_policies.py b/tests/suite/test_rl_policies.py
@@ -5,13 +5,7 @@
 from settings import TEST_DATA
 from suite.utils.custom_resources_utils import read_custom_resource
 from suite.utils.policy_resources_utils import create_policy_from_yaml, delete_policy
-from suite.utils.resources_utils import (
-    get_first_pod_name,
-    get_pod_list,
-    get_vs_nginx_template_conf,
-    scale_deployment,
-    wait_before_test,
-)
+from suite.utils.resources_utils import get_pod_list, get_vs_nginx_template_conf, scale_deployment, wait_before_test
 from suite.utils.vs_vsr_resources_utils import (
     create_virtual_server_from_yaml,
     delete_virtual_server,
diff --git a/tests/suite/test_transport_server_backup_service.py b/tests/suite/test_transport_server_backup_service.py
@@ -1,7 +1,7 @@
 import pytest
-from settings import DEPLOYMENTS, TEST_DATA
+from settings import TEST_DATA
 from suite.fixtures.fixtures import PublicEndpoint
-from suite.utils.custom_resources_utils import create_ts_from_yaml, delete_ts, patch_ts_from_yaml, read_ts
+from suite.utils.custom_resources_utils import create_ts_from_yaml, delete_ts, patch_ts_from_yaml
 from suite.utils.resources_utils import (
     create_configmap_from_yaml,
     create_items_from_yaml,
diff --git a/tests/suite/test_transport_server_service_insight.py b/tests/suite/test_transport_server_service_insight.py
@@ -2,22 +2,19 @@
 
 import pytest
 import requests
-from settings import DEPLOYMENTS, TEST_DATA
+from settings import TEST_DATA
 from suite.fixtures.fixtures import PublicEndpoint
-from suite.utils.custom_resources_utils import create_ts_from_yaml, delete_ts, read_ts
+from suite.utils.custom_resources_utils import create_ts_from_yaml, delete_ts
 from suite.utils.resources_utils import (
     create_items_from_yaml,
     create_secret_from_yaml,
     delete_items_from_yaml,
     delete_secret,
     get_first_pod_name,
-    get_nginx_template_conf,
-    replace_configmap_from_yaml,
     wait_before_test,
     wait_until_all_pods_are_ready,
 )
 from suite.utils.ssl_utils import create_sni_session
-from suite.utils.vs_vsr_resources_utils import create_virtual_server_from_yaml, delete_virtual_server, read_vs
 from suite.utils.yaml_utils import get_first_host_from_yaml
 
 
diff --git a/tests/suite/test_upgrade_resources.py b/tests/suite/test_upgrade_resources.py
@@ -3,15 +3,9 @@
 
 import pytest
 import yaml
-from settings import DEPLOYMENTS, TEST_DATA
-from suite.utils.custom_resources_utils import create_resource_from_manifest, read_custom_resource
-from suite.utils.resources_utils import (
-    create_ingress,
-    create_items_from_yaml,
-    create_namespace,
-    delete_namespace,
-    wait_before_test,
-)
+from settings import TEST_DATA
+from suite.utils.custom_resources_utils import create_resource_from_manifest
+from suite.utils.resources_utils import create_ingress, create_items_from_yaml, create_namespace, delete_namespace
 from suite.utils.vs_vsr_resources_utils import create_virtual_server
 
 tcp_deployment = f"{TEST_DATA}/upgrade-test-resources/tcp-deployment.yaml"
diff --git a/tests/suite/test_use_cluster_ip.py b/tests/suite/test_use_cluster_ip.py
@@ -3,17 +3,14 @@
 from suite.utils.resources_utils import (
     create_example_app,
     create_ingress_from_yaml,
-    create_secret_from_yaml,
     delete_common_app,
     delete_items_from_yaml,
-    delete_secret,
     ensure_connection_to_public_endpoint,
     get_reload_count,
-    replace_secret,
     scale_deployment,
     wait_before_test,
 )
-from suite.utils.yaml_utils import get_first_ingress_host_from_yaml, get_name_from_yaml
+from suite.utils.yaml_utils import get_first_ingress_host_from_yaml
 
 from tests.suite.utils.custom_assertions import assert_pods_scaled_to_count
 
diff --git a/tests/suite/test_v_s_route_weight_changes_dynamic_reload.py b/tests/suite/test_v_s_route_weight_changes_dynamic_reload.py
@@ -1,6 +1,5 @@
 import pytest
 import requests
-import yaml
 from settings import TEST_DATA
 from suite.fixtures.custom_resource_fixtures import VirtualServerRoute
 from suite.utils.resources_utils import (
@@ -13,7 +12,6 @@
     wait_until_all_pods_are_ready,
 )
 from suite.utils.yaml_utils import get_first_host_from_yaml, get_paths_from_vsr_yaml, get_route_namespace_from_vs_yaml
-from yaml.loader import Loader
 
 from tests.suite.utils.custom_assertions import wait_and_assert_status_code
 from tests.suite.utils.vs_vsr_resources_utils import (
diff --git a/tests/suite/test_v_s_route_weight_changes_dynamic_reload_many_splits.py b/tests/suite/test_v_s_route_weight_changes_dynamic_reload_many_splits.py
@@ -1,21 +1,18 @@
 import pytest
 import requests
-import yaml
 from settings import TEST_DATA
 from suite.fixtures.custom_resource_fixtures import VirtualServerRoute
 from suite.utils.resources_utils import (
     create_example_app,
     create_namespace_with_name_from_yaml,
     delete_namespace,
     ensure_response_from_backend,
-    get_reload_count,
     replace_configmap,
     replace_configmap_from_yaml,
     wait_before_test,
     wait_until_all_pods_are_ready,
 )
 from suite.utils.yaml_utils import get_first_host_from_yaml, get_paths_from_vsr_yaml, get_route_namespace_from_vs_yaml
-from yaml.loader import Loader
 
 from tests.suite.utils.custom_assertions import wait_and_assert_status_code
 from tests.suite.utils.vs_vsr_resources_utils import (
diff --git a/tests/suite/test_virtual_server_use_cluster_ip_reloads.py b/tests/suite/test_virtual_server_use_cluster_ip_reloads.py
@@ -1,10 +1,5 @@
 import pytest
-from suite.utils.resources_utils import (
-    get_reload_count,
-    scale_deployment,
-    wait_before_test,
-    wait_until_all_pods_are_ready,
-)
+from suite.utils.resources_utils import get_reload_count, scale_deployment, wait_until_all_pods_are_ready
 
 from tests.suite.utils.custom_assertions import assert_pods_scaled_to_count
 
diff --git a/tests/suite/test_virtual_server_weight_changes_without_reload.py b/tests/suite/test_virtual_server_weight_changes_without_reload.py
@@ -1,6 +1,5 @@
 import pytest
 import requests
-import yaml
 from settings import TEST_DATA
 from suite.utils.custom_assertions import wait_and_assert_status_code
 from suite.utils.resources_utils import ensure_response_from_backend, get_reload_count, wait_before_test
diff --git a/tests/suite/test_watch_secret_namespace.py b/tests/suite/test_watch_secret_namespace.py
@@ -2,9 +2,8 @@
 
 import pytest
 import requests
-from kubernetes.client.rest import ApiException
 from settings import TEST_DATA
-from suite.utils.resources_utils import create_secret_from_yaml, ensure_response_from_backend, wait_before_test
+from suite.utils.resources_utils import create_secret_from_yaml, wait_before_test
 from suite.utils.ssl_utils import create_sni_session
 
 

Original file line number	Diff line number	Diff line change
`@@ -9,7 +9,6 @@`
`9`	`9`	`create_virtual_server_from_yaml,`
`10`	`10`	`delete_and_create_vs_from_yaml,`
`11`	`11`	`delete_virtual_server,`
`12`		`- patch_v_s_route_from_yaml,`
`13`	`12`	`)`
`14`	`13`
`15`	`14`	`std_vs_src = f"{TEST_DATA}/virtual-server/standard/virtual-server.yaml"`