Răsfoiți Sursa

tests: standardize file structure & naming

Nicolas Duchon 5 luni în urmă
părinte
comite
eb09876f97
100 a modificat fișierele cu 54 adăugiri și 50 ștergeri
  1. 0 1
      test/stress_tests/README.md
  2. 0 0
      test/test_acme-http-challenge-location/acme_root/.well-known/acme-challenge/test-filename
  3. 0 0
      test/test_acme-http-challenge-location/certs/nginx-proxy.tld.crt
  4. 0 0
      test/test_acme-http-challenge-location/certs/nginx-proxy.tld.key
  5. 0 0
      test/test_acme-http-challenge-location/test_acme-http-challenge-location-disabled.py
  6. 0 0
      test/test_acme-http-challenge-location/test_acme-http-challenge-location-disabled.yml
  7. 0 0
      test/test_acme-http-challenge-location/test_acme-http-challenge-location-enabled-is-default.py
  8. 0 0
      test/test_acme-http-challenge-location/test_acme-http-challenge-location-enabled-is-default.yml
  9. 0 0
      test/test_acme-http-challenge-location/test_acme-http-challenge-location-legacy.py
  10. 0 0
      test/test_acme-http-challenge-location/test_acme-http-challenge-location-legacy.yml
  11. 4 3
      test/test_build/test_build.py
  12. 0 0
      test/test_debug-endpoint/test_global.py
  13. 0 0
      test/test_debug-endpoint/test_global.yml
  14. 0 0
      test/test_debug-endpoint/test_per-container.py
  15. 0 0
      test/test_debug-endpoint/test_per-container.yml
  16. 0 0
      test/test_default-host/test_default-host.py
  17. 0 0
      test/test_default-host/test_default-host.yml
  18. 0 0
      test/test_docker-unix-socket/test_docker-unix-socket.py
  19. 0 0
      test/test_docker-unix-socket/test_docker-unix-socket.yml
  20. 0 0
      test/test_enable-http-on-missing-cert/test_enable-http-on-missing-cert.py
  21. 0 0
      test/test_enable-http-on-missing-cert/test_enable-http-on-missing-cert.yml
  22. 2 2
      test/test_events/test_events.py
  23. 4 0
      test/test_events/test_events.yml
  24. 0 0
      test/test_fallback/test_fallback.data/custom-fallback.conf
  25. 0 0
      test/test_fallback/test_fallback.data/custom-fallback.yml
  26. 0 0
      test/test_fallback/test_fallback.data/nodefault.certs/http-only.nginx-proxy.test.crt
  27. 0 0
      test/test_fallback/test_fallback.data/nodefault.certs/http-only.nginx-proxy.test.key
  28. 0 0
      test/test_fallback/test_fallback.data/nodefault.certs/https-and-http.nginx-proxy.test.crt
  29. 0 0
      test/test_fallback/test_fallback.data/nodefault.certs/https-and-http.nginx-proxy.test.key
  30. 0 0
      test/test_fallback/test_fallback.data/nodefault.certs/https-only.nginx-proxy.test.crt
  31. 0 0
      test/test_fallback/test_fallback.data/nodefault.certs/https-only.nginx-proxy.test.key
  32. 0 0
      test/test_fallback/test_fallback.data/nodefault.yml
  33. 0 0
      test/test_fallback/test_fallback.data/nohttp-on-app.yml
  34. 0 0
      test/test_fallback/test_fallback.data/nohttp-with-missing-cert.yml
  35. 0 0
      test/test_fallback/test_fallback.data/nohttp.yml
  36. 0 0
      test/test_fallback/test_fallback.data/nohttps-on-app.yml
  37. 0 0
      test/test_fallback/test_fallback.data/nohttps.yml
  38. 0 0
      test/test_fallback/test_fallback.data/untrusteddefault.yml
  39. 0 0
      test/test_fallback/test_fallback.data/withdefault.certs/default.crt
  40. 0 0
      test/test_fallback/test_fallback.data/withdefault.certs/default.key
  41. 0 0
      test/test_fallback/test_fallback.data/withdefault.certs/http-only.nginx-proxy.test.crt
  42. 0 0
      test/test_fallback/test_fallback.data/withdefault.certs/http-only.nginx-proxy.test.key
  43. 0 0
      test/test_fallback/test_fallback.data/withdefault.certs/https-and-http.nginx-proxy.test.crt
  44. 0 0
      test/test_fallback/test_fallback.data/withdefault.certs/https-and-http.nginx-proxy.test.key
  45. 0 0
      test/test_fallback/test_fallback.data/withdefault.certs/https-only.nginx-proxy.test.crt
  46. 0 0
      test/test_fallback/test_fallback.data/withdefault.certs/https-only.nginx-proxy.test.key
  47. 0 0
      test/test_fallback/test_fallback.data/withdefault.yml
  48. 0 0
      test/test_fallback/test_fallback.py
  49. 0 0
      test/test_htpasswd/test_htpasswd-regex-virtual-host.py
  50. 0 0
      test/test_htpasswd/test_htpasswd-regex-virtual-host.yml
  51. 0 0
      test/test_htpasswd/test_htpasswd-virtual-host.py
  52. 0 0
      test/test_htpasswd/test_htpasswd-virtual-host.yml
  53. 0 0
      test/test_htpasswd/test_htpasswd-virtual-path.py
  54. 0 0
      test/test_htpasswd/test_htpasswd-virtual-path.yml
  55. 0 0
      test/test_http-port/test_http-port.py
  56. 0 0
      test/test_http-port/test_http-port.yml
  57. 0 0
      test/test_http2/test_http2-global-disabled.py
  58. 0 0
      test/test_http2/test_http2-global-disabled.yml
  59. 0 0
      test/test_http3/test_http3-global-disabled.py
  60. 0 0
      test/test_http3/test_http3-global-disabled.yml
  61. 0 0
      test/test_http3/test_http3-global-enabled.py
  62. 0 0
      test/test_http3/test_http3-global-enabled.yml
  63. 0 0
      test/test_http3/test_http3-vhost.py
  64. 0 0
      test/test_http3/test_http3-vhost.yml
  65. 0 0
      test/test_ipv6/test_ipv6-prefer-ipv4-network.py
  66. 0 0
      test/test_ipv6/test_ipv6-prefer-ipv4-network.yml
  67. 0 0
      test/test_ipv6/test_ipv6-prefer-ipv6-network.py
  68. 0 0
      test/test_ipv6/test_ipv6-prefer-ipv6-network.yml
  69. 0 0
      test/test_keepalive/test_keepalive.py
  70. 0 0
      test/test_keepalive/test_keepalive.yml
  71. 16 16
      test/test_loadbalancing/test_loadbalancing.py
  72. 27 27
      test/test_loadbalancing/test_loadbalancing.yml
  73. 0 0
      test/test_location-override/test_location-override.py
  74. 1 1
      test/test_location-override/test_location-override.yml
  75. 0 0
      test/test_location-override/vhost.d/explicit-nonroot.nginx-proxy.test_8d960560c82f4e6c8b1b0f03eb30a1afd00e5696_location_override
  76. 0 0
      test/test_location-override/vhost.d/explicit-root-hash-and-nohash.nginx-proxy.test_42099b4af021e53fd8fd4e056c2568d7c2e3ffa8_location_override
  77. 0 0
      test/test_location-override/vhost.d/explicit-root-hash-and-nohash.nginx-proxy.test_location_override
  78. 0 0
      test/test_location-override/vhost.d/explicit-root-hash.nginx-proxy.test_42099b4af021e53fd8fd4e056c2568d7c2e3ffa8_location_override
  79. 0 0
      test/test_location-override/vhost.d/explicit-root-nohash.nginx-proxy.test_location_override
  80. 0 0
      test/test_location-override/vhost.d/implicit-root-hash-and-nohash.nginx-proxy.test_42099b4af021e53fd8fd4e056c2568d7c2e3ffa8_location_override
  81. 0 0
      test/test_location-override/vhost.d/implicit-root-hash-and-nohash.nginx-proxy.test_location_override
  82. 0 0
      test/test_location-override/vhost.d/implicit-root-hash.nginx-proxy.test_42099b4af021e53fd8fd4e056c2568d7c2e3ffa8_location_override
  83. 0 0
      test/test_location-override/vhost.d/implicit-root-nohash.nginx-proxy.test_location_override
  84. 0 0
      test/test_logs/test_log-disabled.py
  85. 0 0
      test/test_logs/test_log-disabled.yml
  86. 0 0
      test/test_logs/test_log-format.py
  87. 0 0
      test/test_logs/test_log-format.yml
  88. 0 0
      test/test_logs/test_log-json-format.py
  89. 0 0
      test/test_logs/test_log-json-format.yml
  90. 0 0
      test/test_logs/test_log-json.py
  91. 0 0
      test/test_logs/test_log-json.yml
  92. 0 0
      test/test_multiple-hosts/test_multiple-hosts.py
  93. 0 0
      test/test_multiple-hosts/test_multiple-hosts.yml
  94. 0 0
      test/test_multiple-networks/test_multiple-networks.py
  95. 0 0
      test/test_multiple-networks/test_multiple-networks.yml
  96. 0 0
      test/test_nominal/test_nominal.py
  97. 0 0
      test/test_nominal/test_nominal.yml
  98. 0 0
      test/test_ports/test_virtual-port-single-different-from-single-port.py
  99. 0 0
      test/test_ports/test_virtual-port-single-different-from-single-port.yml
  100. 0 0
      test/test_ports/test_virtual-port.py

+ 0 - 1
test/stress_tests/README.md

@@ -1 +0,0 @@
-This directory contains tests that showcase scenarios known to break the expected behavior of nginx-proxy.

+ 0 - 0
test/test_acme_http_challenge_location/acme_root/.well-known/acme-challenge/test-filename → test/test_acme-http-challenge-location/acme_root/.well-known/acme-challenge/test-filename


+ 0 - 0
test/test_acme_http_challenge_location/certs/nginx-proxy.tld.crt → test/test_acme-http-challenge-location/certs/nginx-proxy.tld.crt


+ 0 - 0
test/test_acme_http_challenge_location/certs/nginx-proxy.tld.key → test/test_acme-http-challenge-location/certs/nginx-proxy.tld.key


+ 0 - 0
test/test_acme_http_challenge_location/test_acme_challenge_location_disabled.py → test/test_acme-http-challenge-location/test_acme-http-challenge-location-disabled.py


+ 0 - 0
test/test_acme_http_challenge_location/test_acme_challenge_location_disabled.yml → test/test_acme-http-challenge-location/test_acme-http-challenge-location-disabled.yml


+ 0 - 0
test/test_acme_http_challenge_location/test_acme_challenge_location_enabled_is_default.py → test/test_acme-http-challenge-location/test_acme-http-challenge-location-enabled-is-default.py


+ 0 - 0
test/test_acme_http_challenge_location/test_acme_challenge_location_enabled_is_default.yml → test/test_acme-http-challenge-location/test_acme-http-challenge-location-enabled-is-default.yml


+ 0 - 0
test/test_acme_http_challenge_location/test_acme_challenge_location_legacy.py → test/test_acme-http-challenge-location/test_acme-http-challenge-location-legacy.py


+ 0 - 0
test/test_acme_http_challenge_location/test_acme_challenge_location_legacy.yml → test/test_acme-http-challenge-location/test_acme-http-challenge-location-legacy.yml


+ 4 - 3
test/test_build.py → test/test_build/test_build.py

@@ -1,8 +1,8 @@
 """
 Test that nginx-proxy-tester can build successfully
 """
+import pathlib
 import re
-import os
 
 import docker
 import pytest
@@ -13,12 +13,13 @@ client = docker.from_env()
 @pytest.fixture(scope = "session")
 def docker_build(request):
     # Define Dockerfile path
-    dockerfile_path = os.path.join(os.path.dirname(__file__), "requirements/")
+    current_file_path = pathlib.Path(__file__)
+    dockerfile_path = current_file_path.parent.parent.joinpath("requirements")
     dockerfile_name = "Dockerfile-nginx-proxy-tester"
 
     # Build the Docker image
     image, logs = client.images.build(
-        path = dockerfile_path,
+        path = dockerfile_path.as_posix(),
         dockerfile = dockerfile_name,
         rm = True,  # Remove intermediate containers
         tag = "nginx-proxy-tester-ci",  # Tag for the built image

+ 0 - 0
test/test_debug_endpoint/test_global.py → test/test_debug-endpoint/test_global.py


+ 0 - 0
test/test_debug_endpoint/test_global.yml → test/test_debug-endpoint/test_global.yml


+ 0 - 0
test/test_debug_endpoint/test_per_container.py → test/test_debug-endpoint/test_per-container.py


+ 0 - 0
test/test_debug_endpoint/test_per_container.yml → test/test_debug-endpoint/test_per-container.yml


+ 0 - 0
test/test_default-host.py → test/test_default-host/test_default-host.py


+ 0 - 0
test/test_default-host.yml → test/test_default-host/test_default-host.yml


+ 0 - 0
test/test_DOCKER_HOST_unix_socket.py → test/test_docker-unix-socket/test_docker-unix-socket.py


+ 0 - 0
test/test_DOCKER_HOST_unix_socket.yml → test/test_docker-unix-socket/test_docker-unix-socket.yml


+ 0 - 0
test/test_enable_http_on_missing_cert.py → test/test_enable-http-on-missing-cert/test_enable-http-on-missing-cert.py


+ 0 - 0
test/test_enable_http_on_missing_cert.yml → test/test_enable-http-on-missing-cert/test_enable-http-on-missing-cert.yml


+ 2 - 2
test/test_events.py → test/test_events/test_events.py

@@ -22,7 +22,7 @@ def web1(docker_compose):
         },
         ports={"81/tcp": None}
     )
-    docker_compose.networks.get("test_default").connect(container)
+    docker_compose.networks.get("test_events-net").connect(container)
     sleep(2)  # give it some time to initialize and for docker-gen to detect it
     yield container
     try:
@@ -47,7 +47,7 @@ def web2(docker_compose):
         },
         ports={"82/tcp": None}
     )
-    docker_compose.networks.get("test_default").connect(container)
+    docker_compose.networks.get("test_events-net").connect(container)
     sleep(2)  # give it some time to initialize and for docker-gen to detect it
     yield container
     try:

+ 4 - 0
test/test_events.yml → test/test_events/test_events.yml

@@ -1,3 +1,7 @@
+networks:
+  default:
+    name: test_events-net
+
 services:
   nginxproxy:
     image: nginxproxy/nginx-proxy:test

+ 0 - 0
test/test_fallback.data/custom-fallback.conf → test/test_fallback/test_fallback.data/custom-fallback.conf


+ 0 - 0
test/test_fallback.data/custom-fallback.yml → test/test_fallback/test_fallback.data/custom-fallback.yml


+ 0 - 0
test/test_fallback.data/nodefault.certs/http-only.nginx-proxy.test.crt → test/test_fallback/test_fallback.data/nodefault.certs/http-only.nginx-proxy.test.crt


+ 0 - 0
test/test_fallback.data/nodefault.certs/http-only.nginx-proxy.test.key → test/test_fallback/test_fallback.data/nodefault.certs/http-only.nginx-proxy.test.key


+ 0 - 0
test/test_fallback.data/nodefault.certs/https-and-http.nginx-proxy.test.crt → test/test_fallback/test_fallback.data/nodefault.certs/https-and-http.nginx-proxy.test.crt


+ 0 - 0
test/test_fallback.data/nodefault.certs/https-and-http.nginx-proxy.test.key → test/test_fallback/test_fallback.data/nodefault.certs/https-and-http.nginx-proxy.test.key


+ 0 - 0
test/test_fallback.data/nodefault.certs/https-only.nginx-proxy.test.crt → test/test_fallback/test_fallback.data/nodefault.certs/https-only.nginx-proxy.test.crt


+ 0 - 0
test/test_fallback.data/nodefault.certs/https-only.nginx-proxy.test.key → test/test_fallback/test_fallback.data/nodefault.certs/https-only.nginx-proxy.test.key


+ 0 - 0
test/test_fallback.data/nodefault.yml → test/test_fallback/test_fallback.data/nodefault.yml


+ 0 - 0
test/test_fallback.data/nohttp-on-app.yml → test/test_fallback/test_fallback.data/nohttp-on-app.yml


+ 0 - 0
test/test_fallback.data/nohttp-with-missing-cert.yml → test/test_fallback/test_fallback.data/nohttp-with-missing-cert.yml


+ 0 - 0
test/test_fallback.data/nohttp.yml → test/test_fallback/test_fallback.data/nohttp.yml


+ 0 - 0
test/test_fallback.data/nohttps-on-app.yml → test/test_fallback/test_fallback.data/nohttps-on-app.yml


+ 0 - 0
test/test_fallback.data/nohttps.yml → test/test_fallback/test_fallback.data/nohttps.yml


+ 0 - 0
test/test_fallback.data/untrusteddefault.yml → test/test_fallback/test_fallback.data/untrusteddefault.yml


+ 0 - 0
test/test_fallback.data/withdefault.certs/default.crt → test/test_fallback/test_fallback.data/withdefault.certs/default.crt


+ 0 - 0
test/test_fallback.data/withdefault.certs/default.key → test/test_fallback/test_fallback.data/withdefault.certs/default.key


+ 0 - 0
test/test_fallback.data/withdefault.certs/http-only.nginx-proxy.test.crt → test/test_fallback/test_fallback.data/withdefault.certs/http-only.nginx-proxy.test.crt


+ 0 - 0
test/test_fallback.data/withdefault.certs/http-only.nginx-proxy.test.key → test/test_fallback/test_fallback.data/withdefault.certs/http-only.nginx-proxy.test.key


+ 0 - 0
test/test_fallback.data/withdefault.certs/https-and-http.nginx-proxy.test.crt → test/test_fallback/test_fallback.data/withdefault.certs/https-and-http.nginx-proxy.test.crt


+ 0 - 0
test/test_fallback.data/withdefault.certs/https-and-http.nginx-proxy.test.key → test/test_fallback/test_fallback.data/withdefault.certs/https-and-http.nginx-proxy.test.key


+ 0 - 0
test/test_fallback.data/withdefault.certs/https-only.nginx-proxy.test.crt → test/test_fallback/test_fallback.data/withdefault.certs/https-only.nginx-proxy.test.crt


+ 0 - 0
test/test_fallback.data/withdefault.certs/https-only.nginx-proxy.test.key → test/test_fallback/test_fallback.data/withdefault.certs/https-only.nginx-proxy.test.key


+ 0 - 0
test/test_fallback.data/withdefault.yml → test/test_fallback/test_fallback.data/withdefault.yml


+ 0 - 0
test/test_fallback.py → test/test_fallback/test_fallback.py


+ 0 - 0
test/test_htpasswd/test_htpasswd_regex_virtual_host.py → test/test_htpasswd/test_htpasswd-regex-virtual-host.py


+ 0 - 0
test/test_htpasswd/test_htpasswd_regex_virtual_host.yml → test/test_htpasswd/test_htpasswd-regex-virtual-host.yml


+ 0 - 0
test/test_htpasswd/test_htpasswd_virtual_host.py → test/test_htpasswd/test_htpasswd-virtual-host.py


+ 0 - 0
test/test_htpasswd/test_htpasswd_virtual_host.yml → test/test_htpasswd/test_htpasswd-virtual-host.yml


+ 0 - 0
test/test_htpasswd/test_htpasswd_virtual_path.py → test/test_htpasswd/test_htpasswd-virtual-path.py


+ 0 - 0
test/test_htpasswd/test_htpasswd_virtual_path.yml → test/test_htpasswd/test_htpasswd-virtual-path.yml


+ 0 - 0
test/test_http_port.py → test/test_http-port/test_http-port.py


+ 0 - 0
test/test_http_port.yml → test/test_http-port/test_http-port.yml


+ 0 - 0
test/test_http2/test_http2_global_disabled.py → test/test_http2/test_http2-global-disabled.py


+ 0 - 0
test/test_http2/test_http2_global_disabled.yml → test/test_http2/test_http2-global-disabled.yml


+ 0 - 0
test/test_http3/test_http3_global_disabled.py → test/test_http3/test_http3-global-disabled.py


+ 0 - 0
test/test_http3/test_http3_global_disabled.yml → test/test_http3/test_http3-global-disabled.yml


+ 0 - 0
test/test_http3/test_http3_global_enabled.py → test/test_http3/test_http3-global-enabled.py


+ 0 - 0
test/test_http3/test_http3_global_enabled.yml → test/test_http3/test_http3-global-enabled.yml


+ 0 - 0
test/test_http3/test_http3_vhost.py → test/test_http3/test_http3-vhost.py


+ 0 - 0
test/test_http3/test_http3_vhost.yml → test/test_http3/test_http3-vhost.yml


+ 0 - 0
test/test_ipv6/test_ipv6_prefer_ipv4_network.py → test/test_ipv6/test_ipv6-prefer-ipv4-network.py


+ 0 - 0
test/test_ipv6/test_ipv6_prefer_ipv4_network.yml → test/test_ipv6/test_ipv6-prefer-ipv4-network.yml


+ 0 - 0
test/test_ipv6/test_ipv6_prefer_ipv6_network.py → test/test_ipv6/test_ipv6-prefer-ipv6-network.py


+ 0 - 0
test/test_ipv6/test_ipv6_prefer_ipv6_network.yml → test/test_ipv6/test_ipv6-prefer-ipv6-network.yml


+ 0 - 0
test/test_keepalive.py → test/test_keepalive/test_keepalive.py


+ 0 - 0
test/test_keepalive.yml → test/test_keepalive/test_keepalive.yml


+ 16 - 16
test/test_loadbalancing.py → test/test_loadbalancing/test_loadbalancing.py

@@ -1,16 +1,16 @@
-import re
-
-
-def test_loadbalance_hash(docker_compose, nginxproxy):
-    conf = nginxproxy.get_conf().decode('ASCII')
-    r1 = nginxproxy.get("http://loadbalance-enabled.nginx-proxy.tld")
-    r2 = nginxproxy.get("http://loadbalance-enabled.nginx-proxy.tld")
-    assert re.search(r"hash \$remote_addr\;", conf)
-    assert r1.status_code == 200
-    assert r2.text == r1.text
-
-def test_loadbalance_roundrobin(docker_compose, nginxproxy):
-    r1 = nginxproxy.get("http://loadbalance-disabled.nginx-proxy.tld")
-    r2 = nginxproxy.get("http://loadbalance-disabled.nginx-proxy.tld")
-    assert r1.status_code == 200
-    assert r2.text != r1.text
+import re
+
+
+def test_loadbalance_hash(docker_compose, nginxproxy):
+    conf = nginxproxy.get_conf().decode('ASCII')
+    r1 = nginxproxy.get("http://loadbalance-enabled.nginx-proxy.tld")
+    r2 = nginxproxy.get("http://loadbalance-enabled.nginx-proxy.tld")
+    assert re.search(r"hash \$remote_addr\;", conf)
+    assert r1.status_code == 200
+    assert r2.text == r1.text
+
+def test_loadbalance_roundrobin(docker_compose, nginxproxy):
+    r1 = nginxproxy.get("http://loadbalance-disabled.nginx-proxy.tld")
+    r2 = nginxproxy.get("http://loadbalance-disabled.nginx-proxy.tld")
+    assert r1.status_code == 200
+    assert r2.text != r1.text

+ 27 - 27
test/test_loadbalancing.yml → test/test_loadbalancing/test_loadbalancing.yml

@@ -1,27 +1,27 @@
-services:
-  loadbalance-hash:
-    image: web
-    expose:
-      - "81"
-    environment:
-      WEB_PORTS: 81
-      VIRTUAL_HOST: loadbalance-enabled.nginx-proxy.tld
-    labels:
-      com.github.nginx-proxy.nginx-proxy.loadbalance: "hash $$remote_addr;"
-    deploy:
-      replicas: 2
-
-  loadbalance-roundrobin:
-    image: web
-    expose:
-      - "82"
-    environment:
-      WEB_PORTS: 82
-      VIRTUAL_HOST: loadbalance-disabled.nginx-proxy.tld
-    deploy:
-      replicas: 2
-
-  sut:
-    image: nginxproxy/nginx-proxy:test
-    volumes:
-      - /var/run/docker.sock:/tmp/docker.sock:ro
+services:
+  loadbalance-hash:
+    image: web
+    expose:
+      - "81"
+    environment:
+      WEB_PORTS: 81
+      VIRTUAL_HOST: loadbalance-enabled.nginx-proxy.tld
+    labels:
+      com.github.nginx-proxy.nginx-proxy.loadbalance: "hash $$remote_addr;"
+    deploy:
+      replicas: 2
+
+  loadbalance-roundrobin:
+    image: web
+    expose:
+      - "82"
+    environment:
+      WEB_PORTS: 82
+      VIRTUAL_HOST: loadbalance-disabled.nginx-proxy.tld
+    deploy:
+      replicas: 2
+
+  sut:
+    image: nginxproxy/nginx-proxy:test
+    volumes:
+      - /var/run/docker.sock:/tmp/docker.sock:ro

+ 0 - 0
test/test_location-override.py → test/test_location-override/test_location-override.py


+ 1 - 1
test/test_location-override.yml → test/test_location-override/test_location-override.yml

@@ -3,7 +3,7 @@ services:
     image: nginxproxy/nginx-proxy:test
     volumes:
       - /var/run/docker.sock:/tmp/docker.sock:ro
-      - ./test_location-override.vhost.d:/etc/nginx/vhost.d:ro
+      - ./vhost.d:/etc/nginx/vhost.d:ro
 
   explicit-root:
     image: web

+ 0 - 0
test/test_location-override.vhost.d/explicit-nonroot.nginx-proxy.test_8d960560c82f4e6c8b1b0f03eb30a1afd00e5696_location_override → test/test_location-override/vhost.d/explicit-nonroot.nginx-proxy.test_8d960560c82f4e6c8b1b0f03eb30a1afd00e5696_location_override


+ 0 - 0
test/test_location-override.vhost.d/explicit-root-hash-and-nohash.nginx-proxy.test_42099b4af021e53fd8fd4e056c2568d7c2e3ffa8_location_override → test/test_location-override/vhost.d/explicit-root-hash-and-nohash.nginx-proxy.test_42099b4af021e53fd8fd4e056c2568d7c2e3ffa8_location_override


+ 0 - 0
test/test_location-override.vhost.d/explicit-root-hash-and-nohash.nginx-proxy.test_location_override → test/test_location-override/vhost.d/explicit-root-hash-and-nohash.nginx-proxy.test_location_override


+ 0 - 0
test/test_location-override.vhost.d/explicit-root-hash.nginx-proxy.test_42099b4af021e53fd8fd4e056c2568d7c2e3ffa8_location_override → test/test_location-override/vhost.d/explicit-root-hash.nginx-proxy.test_42099b4af021e53fd8fd4e056c2568d7c2e3ffa8_location_override


+ 0 - 0
test/test_location-override.vhost.d/explicit-root-nohash.nginx-proxy.test_location_override → test/test_location-override/vhost.d/explicit-root-nohash.nginx-proxy.test_location_override


+ 0 - 0
test/test_location-override.vhost.d/implicit-root-hash-and-nohash.nginx-proxy.test_42099b4af021e53fd8fd4e056c2568d7c2e3ffa8_location_override → test/test_location-override/vhost.d/implicit-root-hash-and-nohash.nginx-proxy.test_42099b4af021e53fd8fd4e056c2568d7c2e3ffa8_location_override


+ 0 - 0
test/test_location-override.vhost.d/implicit-root-hash-and-nohash.nginx-proxy.test_location_override → test/test_location-override/vhost.d/implicit-root-hash-and-nohash.nginx-proxy.test_location_override


+ 0 - 0
test/test_location-override.vhost.d/implicit-root-hash.nginx-proxy.test_42099b4af021e53fd8fd4e056c2568d7c2e3ffa8_location_override → test/test_location-override/vhost.d/implicit-root-hash.nginx-proxy.test_42099b4af021e53fd8fd4e056c2568d7c2e3ffa8_location_override


+ 0 - 0
test/test_location-override.vhost.d/implicit-root-nohash.nginx-proxy.test_location_override → test/test_location-override/vhost.d/implicit-root-nohash.nginx-proxy.test_location_override


+ 0 - 0
test/test_logs/test_log_disabled.py → test/test_logs/test_log-disabled.py


+ 0 - 0
test/test_logs/test_log_disabled.yml → test/test_logs/test_log-disabled.yml


+ 0 - 0
test/test_logs/test_log_format.py → test/test_logs/test_log-format.py


+ 0 - 0
test/test_logs/test_log_format.yml → test/test_logs/test_log-format.yml


+ 0 - 0
test/test_logs/test_log_json_format.py → test/test_logs/test_log-json-format.py


+ 0 - 0
test/test_logs/test_log_json_format.yml → test/test_logs/test_log-json-format.yml


+ 0 - 0
test/test_logs/test_log_json.py → test/test_logs/test_log-json.py


+ 0 - 0
test/test_logs/test_log_json.yml → test/test_logs/test_log-json.yml


+ 0 - 0
test/test_multiple-hosts.py → test/test_multiple-hosts/test_multiple-hosts.py


+ 0 - 0
test/test_multiple-hosts.yml → test/test_multiple-hosts/test_multiple-hosts.yml


+ 0 - 0
test/test_multiple-networks.py → test/test_multiple-networks/test_multiple-networks.py


+ 0 - 0
test/test_multiple-networks.yml → test/test_multiple-networks/test_multiple-networks.yml


+ 0 - 0
test/test_nominal.py → test/test_nominal/test_nominal.py


+ 0 - 0
test/test_nominal.yml → test/test_nominal/test_nominal.yml


+ 0 - 0
test/test_ports/test_VIRTUAL_PORT-single-different-from-single-port.py → test/test_ports/test_virtual-port-single-different-from-single-port.py


+ 0 - 0
test/test_ports/test_VIRTUAL_PORT-single-different-from-single-port.yml → test/test_ports/test_virtual-port-single-different-from-single-port.yml


+ 0 - 0
test/test_ports/test_VIRTUAL_PORT.py → test/test_ports/test_virtual-port.py


Unele fișiere nu au fost afișate deoarece prea multe fișiere au fost modificate în acest diff