Skip to content

Commit 6a2a6f0

Browse files
committed
Update IC configuration and improve a flaky test.
1 parent bc7f69d commit 6a2a6f0

File tree

2 files changed

+6
-4
lines changed

2 files changed

+6
-4
lines changed

tests/suite/fixtures.py

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -121,12 +121,13 @@ def ingress_controller(cli_arguments, kube_apis, ingress_controller_prerequisite
121121
:return:
122122
"""
123123
namespace = ingress_controller_prerequisites.namespace
124-
print("------------------------- Create IC -----------------------------------")
125-
extra_args = None
124+
print("------------------------- Create IC without CRDs -----------------------------------")
126125
try:
127126
extra_args = request.param.get('extra_args', None)
127+
extra_args.append("-enable-custom-resources=false")
128128
except AttributeError:
129-
print("IC will start without any additional arguments")
129+
print("IC will start with CRDs disabled and without any additional cli-arguments")
130+
extra_args = ["-enable-custom-resources=false"]
130131
name = create_ingress_controller(kube_apis.v1, kube_apis.apps_v1_api, cli_arguments, namespace, extra_args)
131132

132133
def fin():

tests/suite/test_externalname_service.py

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
from settings import TEST_DATA
55
from suite.fixtures import PublicEndpoint
66
from suite.resources_utils import create_ingress_from_yaml, create_service_with_name, \
7-
create_namespace_with_name_from_yaml, create_deployment_with_name, delete_namespace
7+
create_namespace_with_name_from_yaml, create_deployment_with_name, delete_namespace, ensure_response_from_backend
88
from suite.resources_utils import replace_configmap_from_yaml, create_service_from_yaml
99
from suite.resources_utils import replace_configmap, delete_ingress, delete_service, get_ingress_nginx_template_conf
1010
from suite.resources_utils import get_first_pod_name, ensure_connection_to_public_endpoint, wait_before_test
@@ -80,6 +80,7 @@ class TestExternalNameService:
8080
def test_resolver(self, external_name_setup):
8181
wait_before_test()
8282
req_url = f"http://{external_name_setup.public_endpoint.public_ip}:{external_name_setup.public_endpoint.port}/"
83+
ensure_response_from_backend(req_url, external_name_setup.ingress_host)
8384
resp = requests.get(req_url, headers={"host": external_name_setup.ingress_host}, verify=False)
8485
assert resp.status_code == 200
8586

0 commit comments

Comments
 (0)