Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Tests/flakiness tests ci kind #3266

Merged
merged 13 commits into from
Nov 18, 2022
Merged

Tests/flakiness tests ci kind #3266

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
47abf89
add response checks before assert and test retries
vepatel Nov 17, 2022
d72be96
run py linter
vepatel Nov 17, 2022
141ce98
Merge branch 'main' into tests/flakiness-tests-ci-kind
vepatel Nov 17, 2022
8148b93
pin ubi to 8.6-990
vepatel Nov 17, 2022
1bf3186
revert dockerfile changes
vepatel Nov 17, 2022
5a7df58
Merge branch 'main' into tests/flakiness-tests-ci-kind
vepatel Nov 17, 2022
97d96c5
mark event based assertions for retry on failure
vepatel Nov 17, 2022
7f1c6c3
Merge branch 'main' into tests/flakiness-tests-ci-kind
vepatel Nov 17, 2022
f64c7c1
[pre-commit.ci] auto fixes from pre-commit.com hooks
pre-commit-ci[bot] Nov 17, 2022
004f741
flaky retry on event assertion
vepatel Nov 17, 2022
3ce93f5
remove assertion on rejection events, use response
vepatel Nov 18, 2022
90a8ff8
Merge branch 'main' into tests/flakiness-tests-ci-kind
vepatel Nov 18, 2022
a246a4f
initialise resp with mock()
vepatel Nov 18, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
19 changes: 19 additions & 0 deletions tests/suite/test_ac_policies.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@
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 (
ensure_response_from_backend,
get_last_reload_time,
get_test_file_name,
replace_configmap_from_yaml,
Expand Down Expand Up @@ -108,6 +109,9 @@ def test_deny_policy(
"""
Test if ip (10.0.0.1) block-listing is working: default(no policy) -> deny
"""
ensure_response_from_backend(
virtual_server_setup.backend_1_url, virtual_server_setup.vs_host, {"X-Real-IP": "10.0.0.1"}
)
resp = requests.get(
virtual_server_setup.backend_1_url,
headers={"host": virtual_server_setup.vs_host, "X-Real-IP": "10.0.0.1"},
Expand Down Expand Up @@ -174,6 +178,9 @@ def test_allow_policy(
"""
Test if ip (10.0.0.1) allow-listing is working: default(no policy) -> allow
"""
ensure_response_from_backend(
virtual_server_setup.backend_1_url, virtual_server_setup.vs_host, {"X-Real-IP": "10.0.0.1"}
)
resp = requests.get(
virtual_server_setup.backend_1_url,
headers={"host": virtual_server_setup.vs_host, "X-Real-IP": "10.0.0.1"},
Expand Down Expand Up @@ -234,6 +241,9 @@ def test_override_policy(
"""
Test if ip allow-listing overrides block-listing: default(no policy) -> deny and allow
"""
ensure_response_from_backend(
virtual_server_setup.backend_1_url, virtual_server_setup.vs_host, {"X-Real-IP": "10.0.0.1"}
)
resp = requests.get(
virtual_server_setup.backend_1_url,
headers={"host": virtual_server_setup.vs_host, "X-Real-IP": "10.0.0.1"},
Expand Down Expand Up @@ -279,6 +289,9 @@ def test_invalid_policy(
"""
Test if invalid policy is applied then response is 500
"""
ensure_response_from_backend(
virtual_server_setup.backend_1_url, virtual_server_setup.vs_host, {"X-Real-IP": "10.0.0.1"}
)
resp = requests.get(
virtual_server_setup.backend_1_url,
headers={"host": virtual_server_setup.vs_host, "X-Real-IP": "10.0.0.1"},
Expand Down Expand Up @@ -333,6 +346,9 @@ def test_deleted_policy(
"""
Test if valid policy is deleted then response is 500
"""
ensure_response_from_backend(
virtual_server_setup.backend_1_url, virtual_server_setup.vs_host, {"X-Real-IP": "10.0.0.1"}
)
resp = requests.get(
virtual_server_setup.backend_1_url,
headers={"host": virtual_server_setup.vs_host, "X-Real-IP": "10.0.0.1"},
Expand Down Expand Up @@ -388,6 +404,9 @@ def test_route_override_spec(
"""
Test allow policy specified under routes overrides block in spec
"""
ensure_response_from_backend(
virtual_server_setup.backend_1_url, virtual_server_setup.vs_host, {"X-Real-IP": "10.0.0.1"}
)
resp = requests.get(
virtual_server_setup.backend_1_url,
headers={"host": virtual_server_setup.vs_host, "X-Real-IP": "10.0.0.1"},
Expand Down
1 change: 1 addition & 0 deletions tests/suite/test_transport_server_external_name.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -90,6 +90,7 @@ def fin():
indirect=True,
)
class TestTransportServerStatus:
@pytest.mark.flaky(max_runs=3)
def test_template_config(
self,
kube_apis,
Expand Down
2 changes: 1 addition & 1 deletion tests/suite/test_v_s_route.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -311,7 +311,7 @@ def test_make_existing_vsr_invalid(
patch_v_s_route_from_yaml(
kube_apis.custom_objects, v_s_route_setup.route_s.name, route_yaml, v_s_route_setup.route_s.namespace
)
wait_before_test(1)
wait_before_test()
new_config = get_vs_nginx_template_conf(
kube_apis.v1,
v_s_route_setup.namespace,
Expand Down
1 change: 1 addition & 0 deletions tests/suite/test_v_s_route_upstream_tls.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -123,6 +123,7 @@ def test_events_after_setup(
assert_event(vsr_m_event_text, events_ns_m)
assert_event(vs_event_text, events_ns_m)

@pytest.mark.flaky(max_runs=3)
def test_validation_flow(
self,
kube_apis,
Expand Down