thib8956/nginx-proxy
1
0
Fork 0
mirror of https://github.com/thib8956/nginx-proxy synced 2025-02-24 01:38:15 +00:00
Code Issues Releases Wiki Activity

tests: review comments

Browse Source
This commit is contained in:
Nicolas Duchon 2024-12-27 16:16:55 +01:00
parent 1e9745f604
commit ea99c1a6f9
47 changed files with 78 additions and 80 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
test/test_custom/test_defaults-location.yml
View File

@ -11,7 +11,7 @@ services:
expose:
- "81"
environment:
WEB_PORTS: 81
WEB_PORTS: "81"
VIRTUAL_HOST: web1.nginx-proxy.example
web2:
@ -19,7 +19,7 @@ services:
expose:
- "82"
environment:
WEB_PORTS: 82
WEB_PORTS: "82"
VIRTUAL_HOST: web2.nginx-proxy.example
web3:
@ -27,5 +27,5 @@ services:
expose:
- "83"
environment:
WEB_PORTS: 83
WEB_PORTS: "83"
VIRTUAL_HOST: web3.nginx-proxy.example

4
test/test_custom/test_defaults.yml
View File

@ -10,7 +10,7 @@ services:
expose:
- "81"
environment:
WEB_PORTS: 81
WEB_PORTS: "81"
VIRTUAL_HOST: web1.nginx-proxy.example
web2:
@ -18,5 +18,5 @@ services:
expose:
- "82"
environment:
WEB_PORTS: 82
WEB_PORTS: "82"
VIRTUAL_HOST: web2.nginx-proxy.example

6
test/test_custom/test_location-per-vhost.yml
View File

@ -11,7 +11,7 @@ services:
expose:
- "81"
environment:
WEB_PORTS: 81
WEB_PORTS: "81"
VIRTUAL_HOST: web1.nginx-proxy.example
web2:
@ -19,7 +19,7 @@ services:
expose:
- "82"
environment:
WEB_PORTS: 82
WEB_PORTS: "82"
VIRTUAL_HOST: web2.nginx-proxy.example
regex:
@ -27,5 +27,5 @@ services:
expose:
- "83"
environment:
WEB_PORTS: 83
WEB_PORTS: "83"
VIRTUAL_HOST: ~^regex.*\.nginx-proxy\.example$

6
test/test_custom/test_per-vhost.yml
View File

@ -11,7 +11,7 @@ services:
expose:
- "81"
environment:
WEB_PORTS: 81
WEB_PORTS: "81"
VIRTUAL_HOST: web1.nginx-proxy.example
web2:
@ -19,7 +19,7 @@ services:
expose:
- "82"
environment:
WEB_PORTS: 82
WEB_PORTS: "82"
VIRTUAL_HOST: web2.nginx-proxy.example
regex:
@ -27,5 +27,5 @@ services:
expose:
- "83"
environment:
WEB_PORTS: 83
WEB_PORTS: "83"
VIRTUAL_HOST: ~^regex.*\.nginx-proxy\.example$

4
test/test_custom/test_proxy-wide.yml
View File

@ -10,7 +10,7 @@ services:
expose:
- "81"
environment:
WEB_PORTS: 81
WEB_PORTS: "81"
VIRTUAL_HOST: web1.nginx-proxy.example
web2:
@ -18,5 +18,5 @@ services:
expose:
- "82"
environment:
WEB_PORTS: 82
WEB_PORTS: "82"
VIRTUAL_HOST: web2.nginx-proxy.example

6
test/test_debug-endpoint/test_global.yml
View File

@ -11,7 +11,7 @@ services:
expose:
- "81"
environment:
WEB_PORTS: 81
WEB_PORTS: "81"
VIRTUAL_HOST: enabled.debug.nginx-proxy.example
debug_stripped:
@ -19,7 +19,7 @@ services:
expose:
- "82"
environment:
WEB_PORTS: 82
WEB_PORTS: "82"
VIRTUAL_HOST_MULTIPORTS: |-
stripped.debug.nginx-proxy.example:
"/1":
@ -56,7 +56,7 @@ services:
expose:
- "83"
environment:
WEB_PORTS: 83
WEB_PORTS: "83"
VIRTUAL_HOST: disabled.debug.nginx-proxy.example
labels:
com.github.nginx-proxy.nginx-proxy.debug-endpoint: "false"

6
test/test_debug-endpoint/test_per-container.yml
View File

@ -9,7 +9,7 @@ services:
expose:
- "81"
environment:
WEB_PORTS: 81
WEB_PORTS: "81"
VIRTUAL_HOST: disabled1.debug.nginx-proxy.example
debug_disabled2:
@ -17,7 +17,7 @@ services:
expose:
- "82"
environment:
WEB_PORTS: 82
WEB_PORTS: "82"
VIRTUAL_HOST: disabled2.debug.nginx-proxy.example
@ -26,7 +26,7 @@ services:
expose:
- "83"
environment:
WEB_PORTS: 83
WEB_PORTS: "83"
VIRTUAL_HOST: enabled.debug.nginx-proxy.example
labels:
com.github.nginx-proxy.nginx-proxy.debug-endpoint: "true"

2
test/test_default-host/test_default-host.yml
View File

@ -5,7 +5,7 @@ services:
expose:
- "81"
environment:
WEB_PORTS: 81
WEB_PORTS: "81"
VIRTUAL_HOST: web1.tld
# WHEN nginx-proxy runs with DEFAULT_HOST set to web1.tld

4
test/test_docker-unix-socket/test_docker-unix-socket.yml
View File

@ -4,7 +4,7 @@ services:
expose:
- "81"
environment:
WEB_PORTS: 81
WEB_PORTS: "81"
VIRTUAL_HOST: web1.nginx-proxy.tld
web2:
@ -12,7 +12,7 @@ services:
expose:
- "82"
environment:
WEB_PORTS: 82
WEB_PORTS: "82"
VIRTUAL_HOST: web2.nginx-proxy.tld
sut:

1
test/test_dockergen/.gitignore vendored
View File

@ -1 +0,0 @@
nginx.tmpl

2
test/test_dockergen/test_dockergen.yml
View File

@ -19,7 +19,7 @@ services:
expose:
- "80"
environment:
WEB_PORTS: 80
WEB_PORTS: "80"
VIRTUAL_HOST: whoami.nginx.container.docker
volumes:

4
test/test_headers/test_http.yml
View File

@ -4,7 +4,7 @@ services:
expose:
- "80"
environment:
WEB_PORTS: 80
WEB_PORTS: "80"
VIRTUAL_HOST: web.nginx-proxy.tld
web-server-tokens-off:
@ -12,7 +12,7 @@ services:
expose:
- "80"
environment:
WEB_PORTS: 80
WEB_PORTS: "80"
VIRTUAL_HOST: web-server-tokens-off.nginx-proxy.tld
SERVER_TOKENS: "off"

4
test/test_headers/test_https.yml
View File

@ -4,7 +4,7 @@ services:
expose:
- "80"
environment:
WEB_PORTS: 80
WEB_PORTS: "80"
VIRTUAL_HOST: web.nginx-proxy.tld
web-server-tokens-off:
@ -12,7 +12,7 @@ services:
expose:
- "80"
environment:
WEB_PORTS: 80
WEB_PORTS: "80"
VIRTUAL_HOST: web-server-tokens-off.nginx-proxy.tld
SERVER_TOKENS: "off"

2
test/test_htpasswd/test_htpasswd-regex-virtual-host.yml
View File

@ -4,7 +4,7 @@ services:
expose:
- "80"
environment:
WEB_PORTS: 80
WEB_PORTS: "80"
VIRTUAL_HOST: ~^regex.*\.nginx-proxy\.example$
sut:

2
test/test_htpasswd/test_htpasswd-virtual-host.yml
View File

@ -4,7 +4,7 @@ services:
expose:
- "80"
environment:
WEB_PORTS: 80
WEB_PORTS: "80"
VIRTUAL_HOST: htpasswd.nginx-proxy.tld
sut:

2
test/test_htpasswd/test_htpasswd-virtual-path.yml
View File

@ -4,7 +4,7 @@ services:
expose:
- "80"
environment:
WEB_PORTS: 80
WEB_PORTS: "80"
VIRTUAL_HOST: htpasswd.nginx-proxy.tld
VIRTUAL_PATH: /foo/
VIRTUAL_DEST: /

2
test/test_http2/test_http2-global-disabled.yml
View File

@ -4,7 +4,7 @@ services:
expose:
- "80"
environment:
WEB_PORTS: 80
WEB_PORTS: "80"
VIRTUAL_HOST: http2-global-disabled.nginx-proxy.tld
sut:

2
test/test_http3/test_http3-global-disabled.yml
View File

@ -4,7 +4,7 @@ services:
expose:
- "80"
environment:
WEB_PORTS: 80
WEB_PORTS: "80"
VIRTUAL_HOST: http3-global-disabled.nginx-proxy.tld
sut:

2
test/test_http3/test_http3-global-enabled.yml
View File

@ -4,7 +4,7 @@ services:
expose:
- "80"
environment:
WEB_PORTS: 80
WEB_PORTS: "80"
VIRTUAL_HOST: http3-global-enabled.nginx-proxy.tld
sut:

6
test/test_http3/test_http3-vhost.yml
View File

@ -4,7 +4,7 @@ services:
expose:
- "80"
environment:
WEB_PORTS: 80
WEB_PORTS: "80"
VIRTUAL_HOST: http3-vhost-enabled.nginx-proxy.tld
labels:
com.github.nginx-proxy.nginx-proxy.http3.enable: "true"
@ -14,7 +14,7 @@ services:
expose:
- "80"
environment:
WEB_PORTS: 80
WEB_PORTS: "80"
VIRTUAL_HOST: http3-vhost-disabled.nginx-proxy.tld
labels:
com.github.nginx-proxy.nginx-proxy.http3.enable: "false"
@ -24,7 +24,7 @@ services:
expose:
- "80"
environment:
WEB_PORTS: 80
WEB_PORTS: "80"
VIRTUAL_HOST: http3-vhost-default-disabled.nginx-proxy.tld
sut:

4
test/test_internal/test_internal-per-vhost.yml
View File

@ -4,7 +4,7 @@ services:
expose:
- "81"
environment:
WEB_PORTS: 81
WEB_PORTS: "81"
VIRTUAL_HOST: web1.nginx-proxy.example
NETWORK_ACCESS: internal
@ -13,7 +13,7 @@ services:
expose:
- "82"
environment:
WEB_PORTS: 82
WEB_PORTS: "82"
VIRTUAL_HOST: web2.nginx-proxy.example
sut:

4
test/test_internal/test_internal-per-vpath.yml
View File

@ -4,7 +4,7 @@ services:
expose:
- "81"
environment:
WEB_PORTS: 81
WEB_PORTS: "81"
VIRTUAL_HOST: nginx-proxy.example
VIRTUAL_PATH: /web1/
VIRTUAL_DEST: /
@ -15,7 +15,7 @@ services:
expose:
- "82"
environment:
WEB_PORTS: 82
WEB_PORTS: "82"
VIRTUAL_HOST: nginx-proxy.example
VIRTUAL_PATH: /web2/
VIRTUAL_DEST: /

2
test/test_ipv6/test_ipv6-prefer-ipv4-network.yml
View File

@ -16,7 +16,7 @@ services:
expose:
- "80"
environment:
WEB_PORTS: 80
WEB_PORTS: "80"
VIRTUAL_HOST: ipv4only.nginx-proxy.tld
networks:
ipv4net:

2
test/test_ipv6/test_ipv6-prefer-ipv6-network.yml
View File

@ -16,7 +16,7 @@ services:
expose:
- "80"
environment:
WEB_PORTS: 80
WEB_PORTS: "80"
VIRTUAL_HOST: ipv4only.nginx-proxy.tld
networks:
ipv4net:

4
test/test_ipv6/test_ipv6.yml
View File

@ -11,7 +11,7 @@ services:
expose:
- "81"
environment:
WEB_PORTS: 81
WEB_PORTS: "81"
VIRTUAL_HOST: web1.nginx-proxy.tld
networks:
- net1
@ -21,7 +21,7 @@ services:
expose:
- "82"
environment:
WEB_PORTS: 82
WEB_PORTS: "82"
VIRTUAL_HOST: web2.nginx-proxy.tld
networks:
- net1

6
test/test_keepalive/test_keepalive.yml
View File

@ -4,7 +4,7 @@ services:
expose:
- "80"
environment:
WEB_PORTS: 80
WEB_PORTS: "80"
VIRTUAL_HOST: keepalive-disabled.nginx-proxy.test
labels:
com.github.nginx-proxy.nginx-proxy.keepalive: "disabled"
@ -14,7 +14,7 @@ services:
expose:
- "80"
environment:
WEB_PORTS: 80
WEB_PORTS: "80"
VIRTUAL_HOST: keepalive-enabled.nginx-proxy.test
labels:
com.github.nginx-proxy.nginx-proxy.keepalive: "64"
@ -27,7 +27,7 @@ services:
expose:
- "80"
environment:
WEB_PORTS: 80
WEB_PORTS: "80"
VIRTUAL_HOST: keepalive-auto.nginx-proxy.test
sut:

4
test/test_loadbalancing/test_loadbalancing.yml
View File

@ -4,7 +4,7 @@ services:
expose:
- "81"
environment:
WEB_PORTS: 81
WEB_PORTS: "81"
VIRTUAL_HOST: loadbalance-enabled.nginx-proxy.tld
labels:
com.github.nginx-proxy.nginx-proxy.loadbalance: "hash $$remote_addr;"
@ -16,7 +16,7 @@ services:
expose:
- "82"
environment:
WEB_PORTS: 82
WEB_PORTS: "82"
VIRTUAL_HOST: loadbalance-disabled.nginx-proxy.tld
deploy:
replicas: 2

2
test/test_logs/test_log-disabled.yml
View File

@ -4,7 +4,7 @@ services:
expose:
- "81"
environment:
WEB_PORTS: 81
WEB_PORTS: "81"
VIRTUAL_HOST: nginx-proxy.test
sut:

2
test/test_logs/test_log-format.yml
View File

@ -4,7 +4,7 @@ services:
expose:
- "81"
environment:
WEB_PORTS: 81
WEB_PORTS: "81"
VIRTUAL_HOST: nginx-proxy.test
sut:

2
test/test_logs/test_log-json-format.yml
View File

@ -4,7 +4,7 @@ services:
expose:
- "81"
environment:
WEB_PORTS: 81
WEB_PORTS: "81"
VIRTUAL_HOST: nginx-proxy.test
sut:

2
test/test_logs/test_log-json.yml
View File

@ -4,7 +4,7 @@ services:
expose:
- "81"
environment:
WEB_PORTS: 81
WEB_PORTS: "81"
VIRTUAL_HOST: nginx-proxy.test
sut:

2
test/test_multiple-hosts/test_multiple-hosts.yml
View File

@ -4,7 +4,7 @@ services:
expose:
- "81"
environment:
WEB_PORTS: 81
WEB_PORTS: "81"
VIRTUAL_HOST: webA.nginx-proxy.tld,webB.nginx-proxy.tld
sut:

3
test/test_multiple-networks/test_multiple-networks.py
View File

@ -21,6 +21,5 @@ def test_multipath(docker_compose, nginxproxy):
assert r.text == "answer from port 83\n"
cfg = nginxproxy.get_conf().decode()
lines = cfg.splitlines()
web3_server_lines = [l for l in lines
if re.search(r'(?m)^\s*server\s+[^\s]*:83;\s*$', l)]
web3_server_lines = [l for l in lines if re.search(r'(?m)^\s*server\s+\S*:83;\s*$', l)]
assert len(web3_server_lines) == 1

6
test/test_multiple-networks/test_multiple-networks.yml
View File

@ -20,7 +20,7 @@ services:
expose:
- "81"
environment:
WEB_PORTS: 81
WEB_PORTS: "81"
VIRTUAL_HOST: web1.nginx-proxy.example
networks:
- net1
@ -30,7 +30,7 @@ services:
expose:
- "82"
environment:
WEB_PORTS: 82
WEB_PORTS: "82"
VIRTUAL_HOST: web2.nginx-proxy.example
networks:
- net2
@ -40,7 +40,7 @@ services:
expose:
- "83"
environment:
WEB_PORTS: 83
WEB_PORTS: "83"
VIRTUAL_HOST: web3.nginx-proxy.test
networks:
- net3a

4
test/test_nominal/test_nominal.yml
View File

@ -11,7 +11,7 @@ services:
expose:
- "81"
environment:
WEB_PORTS: 81
WEB_PORTS: "81"
VIRTUAL_HOST: web1.nginx-proxy.tld
networks:
- net1
@ -21,7 +21,7 @@ services:
expose:
- "82"
environment:
WEB_PORTS: 82
WEB_PORTS: "82"
VIRTUAL_HOST: web2.nginx-proxy.tld
networks:
- net1

4
test/test_raw-ip-vhost/test_raw-ip-vhost.yml
View File

@ -13,7 +13,7 @@ services:
expose:
- "81"
environment:
WEB_PORTS: 81
WEB_PORTS: "81"
VIRTUAL_HOST: "172.20.0.4"
networks:
net1:
@ -26,7 +26,7 @@ services:
expose:
- "82"
environment:
WEB_PORTS: 82
WEB_PORTS: "82"
VIRTUAL_HOST: "[fd00::4]"
networks:
net1:

6
test/test_server-down/test_load-balancing.yml
View File

@ -4,7 +4,7 @@ services:
expose:
- "81"
environment:
WEB_PORTS: 81
WEB_PORTS: "81"
VIRTUAL_HOST: web.nginx-proxy.tld
web2:
@ -12,7 +12,7 @@ services:
expose:
- "82"
environment:
WEB_PORTS: 83
WEB_PORTS: "83"
VIRTUAL_HOST: web.nginx-proxy.tld
web3:
@ -20,7 +20,7 @@ services:
expose:
- "83"
environment:
WEB_PORTS: 83
WEB_PORTS: "83"
VIRTUAL_HOST: web.nginx-proxy.tld
network_mode: "none"

2
test/test_server-down/test_no-server-down.yml
View File

@ -4,7 +4,7 @@ services:
expose:
- "81"
environment:
WEB_PORTS: 81
WEB_PORTS: "81"
VIRTUAL_HOST: web.nginx-proxy.tld
sut:

2
test/test_server-down/test_server-down.yml
View File

@ -4,7 +4,7 @@ services:
expose:
- "81"
environment:
WEB_PORTS: 81
WEB_PORTS: "81"
VIRTUAL_HOST: web.nginx-proxy.tld
network_mode: "none"

2
test/test_trust-downstream-proxy/test_default.yml
View File

@ -4,7 +4,7 @@ services:
expose:
- "80"
environment:
WEB_PORTS: 80
WEB_PORTS: "80"
VIRTUAL_HOST: web.nginx-proxy.tld
HTTPS_METHOD: noredirect

2
test/test_trust-downstream-proxy/test_disabled.yml
View File

@ -4,7 +4,7 @@ services:
expose:
- "80"
environment:
WEB_PORTS: 80
WEB_PORTS: "80"
VIRTUAL_HOST: web.nginx-proxy.tld
HTTPS_METHOD: noredirect

2
test/test_trust-downstream-proxy/test_enabled.yml
View File

@ -4,7 +4,7 @@ services:
expose:
- "80"
environment:
WEB_PORTS: 80
WEB_PORTS: "80"
VIRTUAL_HOST: web.nginx-proxy.tld
HTTPS_METHOD: noredirect

4
test/test_unreachable-network/test_unreachable-network.yml
View File

@ -18,7 +18,7 @@ services:
expose:
- 81
environment:
WEB_PORTS: 81
WEB_PORTS: "81"
VIRTUAL_HOST: webA.nginx-proxy
webB:
@ -28,5 +28,5 @@ services:
expose:
- 82
environment:
WEB_PORTS: 82
WEB_PORTS: "82"
VIRTUAL_HOST: webB.nginx-proxy

2
test/test_upstream-name/test_predictable-name.yml
View File

@ -4,7 +4,7 @@ services:
expose:
- "80"
environment:
WEB_PORTS: 80
WEB_PORTS: "80"
VIRTUAL_HOST: web.nginx-proxy.tld
sut:

2
test/test_upstream-name/test_sha1-name.yml
View File

@ -4,7 +4,7 @@ services:
expose:
- "80"
environment:
WEB_PORTS: 80
WEB_PORTS: "80"
VIRTUAL_HOST: web.nginx-proxy.tld
sut:

6
test/test_vhost-in-multiple-networks/test_vhost-in-multiple-networks.py
View File

@ -1,5 +1,5 @@
import logging
import time
from time import sleep
import pytest
@ -13,11 +13,11 @@ def test_nginx_config_remains_the_same_after_restart(docker_compose, nginxproxy)
"""
Restarts the Web container and returns nginx-proxy config after restart
"""
def get_conf_after_web_container_restart():
def get_conf_after_web_container_restart() -> bytes:
web_containers = docker_compose.containers.list(filters={"ancestor": "web:latest"})
assert len(web_containers) == 1
web_containers[0].restart()
time.sleep(3)
sleep(3)
return nginxproxy.get_conf()

2
test/test_vhost-in-multiple-networks/test_vhost-in-multiple-networks.yml
View File

@ -16,7 +16,7 @@ services:
expose:
- "81"
environment:
WEB_PORTS: 81
WEB_PORTS: "81"
VIRTUAL_HOST: web1.nginx-proxy.example
networks:
- net1