8000 calculate diff only when test fails and fix linting · nginx/kubernetes-ingress@db33331 · GitHub
[go: up one dir, main page]
Skip to content

Commit db33331

Browse files
haywoodshhaywoodsh
committed
calculate diff only when test fails and fix linting
1 parent c2e3cb7 commit db33331

File tree

2 files changed

+27
-34
lines changed

2 files changed

+27
-34
lines changed

‎internal/configs/ingress_test.go‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -163,8 +163,8 @@ func TestGenerateNginxCfgWithIPV6Disabled(t *testing.T) {
163163

164164
result, warnings := generateNginxCfg(&cafeIngressEx, nil, nil, false, configParams, isPlus, false, &StaticConfigParams{DisableIPV6: true}, false)
165165

166-
if diff := cmp.Diff(expected, result); diff != "" {
167-
t.Errorf("generateNginxCfg() returned unexpected result (-want +got):\n%s", diff)
166+
if !cmp.Equal(expected, result) {
167+
t.Errorf("generateNginxCfg() returned unexpected result (-want +got):\n%s", cmp.Diff(expected, result))
168168
}
169169
if len(warnings) != 0 {
170170
t.Errorf("generateNginxCfg() returned warnings: %v", warnings)

‎tests/suite/test_disable_ipv6_ingress.py‎

Lines changed: 25 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
import pytest
2-
32
from settings import TEST_DATA
43
from suite.fixtures import PublicEndpoint
54
from suite.resources_utils import (
@@ -33,12 +32,7 @@ class DisableIPV6Setup:
3332
namespace (str):
3433
"""
3534

36-
def __init__(self,
37-
public_endpoint: PublicEndpoint,
38-
ingress_name,
39-
ingress_host,
40-
ingress_pod_name,
41-
namespace):
35+
def __init__(self, public_endpoint: PublicEndpoint, ingress_name, ingress_host, ingress_pod_name, namespace):
4236
self.public_endpoint = public_endpoint
4337
self.ingress_host = ingress_host
4438
self.ingress_name = ingress_name
@@ -47,22 +41,26 @@ def __init__(self,
4741

4842

4943
@pytest.fixture(scope="class", params=["standard", "mergeable"])
50-
def disable_ipv6_setup(request,
51-
kube_apis,
52-
ingress_controller_prerequisites,
53-
ingress_controller_endpoint,
54-
ingress_controller,
55-
test_namespace
56-
) -> DisableIPV6Setup:
44+
def disable_ipv6_setup(
45+
request,
46+
kube_apis,
47+
ingress_controller_prerequisites,
48+
ingress_controller_endpoint,
49+
ingress_controller,
50+
test_namespace,
51+
) -> DisableIPV6Setup:
5752
print("------------------------- Deploy Disable IPV6 Example -----------------------------------")
58-
secret_name = create_secret_from_yaml(kube_apis.v1, test_namespace,
59-
f"{TEST_DATA}/disable-ipv6-ingress/disable-ipv6-secret.yaml")
53+
secret_name = create_secret_from_yaml(
54+
kube_apis.v1, test_namespace, f"{TEST_DATA}/disable-ipv6-ingress/disable-ipv6-secret.yaml"
55+
)
6056

61-
create_items_from_yaml(kube_apis, f"{TEST_DATA}/disable-ipv6-ingress/{request.param}/disable-ipv6-ingress.yaml",
62-
test_namespace)
57+
create_items_from_yaml(
58+
kube_apis, f"{TEST_DATA}/disable-ipv6-ingress/{request.param}/disable-ipv6-ingress.yaml", test_namespace
59+
)
6360
ingress_name = get_name_from_yaml(f"{TEST_DATA}/disable-ipv6-ingress/{request.param}/disable-ipv6-ingress.yaml")
6461
ingress_host = get_first_ingress_host_from_yaml(
65-
f"{TEST_DATA}/disable-ipv6-ingress/{request.param}/disable-ipv6-ingress.yaml")
62+
f"{TEST_DATA}/disable-ipv6-ingress/{request.param}/disable-ipv6-ingress.yaml"
63+
)
6664
create_example_app(kube_apis, "simple", test_namespace)
6765
wait_until_all_pods_are_ready(kube_apis.v1, test_namespace)
6866

@@ -76,35 +74,30 @@ def disable_ipv6_setup(request,
7674
def fin():
7775
print("Clean up the Disable IPV6 Application:")
7876
delete_common_app(kube_apis, "simple", test_namespace)
79-
delete_items_from_yaml(kube_apis, f"{TEST_DATA}/disable-ipv6-ingress/{request.param}/disable-ipv6-ingress.yaml",
80-
test_namespace)
77+
delete_items_from_yaml(
78+
kube_apis, f"{TEST_DATA}/disable-ipv6-ingress/{request.param}/disable-ipv6-ingress.yaml", test_namespace
79+
)
8180
delete_secret(kube_apis.v1, secret_name, test_namespace)
8281

8382
request.addfinalizer(fin)
8483

85-
return DisableIPV6Setup(ingress_controller_endpoint,
86-
ingress_name,
87-
ingress_host,
88-
ic_pod_name,
89-
test_namespace)
84+
return DisableIPV6Setup(ingress_controller_endpoint, ingress_name, ingress_host, ic_pod_name, test_namespace)
9085

9186

9287
@pytest.mark.ingresses
9388
class TestDisableIPV6:
94-
9589
@pytest.mark.parametrize(
9690
"ingress_controller",
9791
[
9892
pytest.param({"extra_args": ["-disable-ipv6"]}, id="one-additional-cli-args"),
99-
10093
],
10194
indirect=True,
10295
)
10396
def test_ipv6_listeners_not_in_config(
104-
self,
105-
kube_apis,
106-
disable_ipv6_setup: DisableIPV6Setup,
107-
ingress_controller_prerequisites,
97+
self,
98+
kube_apis,
99+
disable_ipv6_setup: DisableIPV6Setup,
100+
ingress_controller_prerequisites,
108101
):
109102
wait_before_test()
110103
nginx_config = get_nginx_template_conf(kube_apis.v1, ingress_controller_prerequisites.namespace)

0 commit comments

Comments
 (0)
0