From 2f615265e98020d9c09667d37c8bd48f9afce03b Mon Sep 17 00:00:00 2001 From: Dean Coakley Date: Mon, 12 Aug 2019 17:16:27 +0100 Subject: [PATCH] Fix vs/vsr tests for connection headers * Was testing for the presence of "proxy_set_header Connection" * Now tests for the presence of "set $default_connection_header" $default_connection_header is a custom variable that is used for upgrading to the Websocket protocol when using vs/vsr upstreams --- tests/suite/test_v_s_route_upstream_options.py | 8 ++++---- tests/suite/test_virtual_server_upstream_options.py | 8 ++++---- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/tests/suite/test_v_s_route_upstream_options.py b/tests/suite/test_v_s_route_upstream_options.py index 4b5b30d403..ff421591a9 100644 --- a/tests/suite/test_v_s_route_upstream_options.py +++ b/tests/suite/test_v_s_route_upstream_options.py @@ -70,7 +70,7 @@ def test_nginx_config_upstreams_defaults(self, kube_apis, ingress_controller_pre assert "max_fails=1 fail_timeout=10s max_conns=0;" in config assert "keepalive" not in config - assert 'proxy_set_header Connection "";' not in config + assert 'set $default_connection_header "";' not in config assert "proxy_next_upstream error timeout;" in config assert "proxy_next_upstream_timeout 0s;" in config @@ -82,7 +82,7 @@ def test_nginx_config_upstreams_defaults(self, kube_apis, ingress_controller_pre "keepalive": 54, "max-conns": 1024}, ["least_conn;", "max_fails=8 ", "fail_timeout=13s ", "proxy_connect_timeout 55s;", "proxy_read_timeout 1s;", - "proxy_send_timeout 1h;", "keepalive 54;", 'proxy_set_header Connection "";', "max_conns=1024;"]), + "proxy_send_timeout 1h;", "keepalive 54;", 'set $default_connection_header "";', "max_conns=1024;"]), ({"lb-method": "ip_hash", "connect-timeout": "75", "read-timeout": "15", "send-timeout": "1h"}, ["ip_hash;", "proxy_connect_timeout 75;", "proxy_read_timeout 15;", "proxy_send_timeout 1h;"]), ({"connect-timeout": "1m", "read-timeout": "1m", "send-timeout": "1s"}, @@ -140,7 +140,7 @@ def test_when_option_in_v_s_r_only(self, kube_apis, (f"{TEST_DATA}/virtual-server-route-upstream-options/configmap-with-keys.yaml", ["max_fails=3 ", "fail_timeout=33s ", "max_conns=0;", "proxy_connect_timeout 44s;", "proxy_read_timeout 22s;", "proxy_send_timeout 55s;", - "keepalive 1024;", 'proxy_set_header Connection "";'], + "keepalive 1024;", 'set $default_connection_header "";'], ["ip_hash;", "least_conn;", "random ", "hash", "least_time ", "max_fails=1 ", "fail_timeout=10s ", "max_conns=1000;", "proxy_connect_timeout 60s;", "proxy_read_timeout 60s;", "proxy_send_timeout 60s;"]), @@ -194,7 +194,7 @@ def test_when_option_in_config_map_only(self, kube_apis, "keepalive": 48}, ["least_conn;", "max_fails=12 ", "fail_timeout=1m ", "max_conns=0;", "proxy_connect_timeout 1m;", "proxy_read_timeout 77s;", "proxy_send_timeout 23s;", - "keepalive 48;", 'proxy_set_header Connection "";'], + "keepalive 48;", 'set $default_connection_header "";'], ["ip_hash;", "random ", "hash", "least_time ", "max_fails=1 ", "fail_timeout=10s ", "proxy_connect_timeout 44s;", "proxy_read_timeout 22s;", "proxy_send_timeout 55s;", "keepalive 1024;"]) diff --git a/tests/suite/test_virtual_server_upstream_options.py b/tests/suite/test_virtual_server_upstream_options.py index 5263de5416..6112e612d1 100644 --- a/tests/suite/test_virtual_server_upstream_options.py +++ b/tests/suite/test_virtual_server_upstream_options.py @@ -74,7 +74,7 @@ def test_nginx_config_defaults(self, kube_apis, ingress_controller_prerequisites assert "max_fails=1 fail_timeout=10s max_conns=0;" in config assert "keepalive" not in config - assert 'proxy_set_header Connection "";' not in config + assert 'set $default_connection_header "";' not in config assert "proxy_next_upstream error timeout;" in config assert "proxy_next_upstream_timeout 0s;" in config @@ -86,7 +86,7 @@ def test_nginx_config_defaults(self, kube_apis, ingress_controller_prerequisites "keepalive": 54, "max-conns": 1048}, ["least_conn;", "max_fails=8 ", "fail_timeout=13s ", "proxy_connect_timeout 55s;", "proxy_read_timeout 1s;", - "proxy_send_timeout 1h;", "keepalive 54;", 'proxy_set_header Connection "";', "max_conns=1048;"]), + "proxy_send_timeout 1h;", "keepalive 54;", 'set $default_connection_header "";', "max_conns=1048;"]), ({"lb-method": "ip_hash", "connect-timeout": "75", "read-timeout": "15", "send-timeout": "1h"}, ["ip_hash;", "proxy_connect_timeout 75;", "proxy_read_timeout 15;", "proxy_send_timeout 1h;"]), ({"connect-timeout": "1m", "read-timeout": "1m", "send-timeout": "1s"}, @@ -130,7 +130,7 @@ def test_when_option_in_v_s_only(self, kube_apis, ingress_controller_prerequisit (f"{TEST_DATA}/virtual-server-upstream-options/configmap-with-keys.yaml", ["max_fails=3 ", "fail_timeout=33s ", "max_conns=0;", "proxy_connect_timeout 44s;", "proxy_read_timeout 22s;", "proxy_send_timeout 55s;", - "keepalive 1024;", 'proxy_set_header Connection "";'], + "keepalive 1024;", 'set $default_connection_header "";'], ["ip_hash;", "least_conn;", "random ", "hash", "least_time ", "max_fails=1 ", "fail_timeout=10s ", "max_conns=1000;", "proxy_connect_timeout 60s;", "proxy_read_timeout 60s;", "proxy_send_timeout 60s;"]), @@ -174,7 +174,7 @@ def test_when_option_in_config_map_only(self, kube_apis, ingress_controller_prer "keepalive": 48}, ["least_conn;", "max_fails=12 ", "fail_timeout=1m ", "max_conns=0;", "proxy_connect_timeout 1m;", "proxy_read_timeout 77s;", - "proxy_send_timeout 23s;", "keepalive 48;", 'proxy_set_header Connection "";'], + "proxy_send_timeout 23s;", "keepalive 48;", 'set $default_connection_header "";'], ["ip_hash;", "random ", "hash", "least_time ", "max_fails=1 ", "fail_timeout=10s ", "proxy_connect_timeout 44s;", "proxy_read_timeout 22s;", "proxy_send_timeout 55s;", "keepalive 1024;"])