Explorar o código

tests: Fix path to `ca-root.crt`

`os.getcwd()` is not guaranteed to always return the `test/`
directory.
Richard Hansen %!s(int64=2) %!d(string=hai) anos
pai
achega
01745a836f
Modificáronse 2 ficheiros con 8 adicións e 3 borrados
  1. 6 0
      test/conftest.py
  2. 2 3
      test/test_ssl/test_dhparam.py

+ 6 - 0
test/conftest.py

@@ -425,6 +425,12 @@ def connect_to_all_networks():
 #
 ###############################################################################
 
+
+@pytest.fixture
+def ca_root_certificate():
+    return CA_ROOT_CERTIFICATE
+
+
 @pytest.fixture(scope="module")
 def docker_compose(request):
     """

+ 2 - 3
test/test_ssl/test_dhparam.py

@@ -1,6 +1,5 @@
 import re
 import subprocess
-import os
 
 import backoff
 import docker
@@ -219,7 +218,7 @@ def test_custom_dhparam_is_supported(docker_compose):
 
 # Only `web2` has a site-specific DH param file (which overrides all other DH config)
 # Other tests here use `web5` explicitly, or implicitly (via ENV `DEFAULT_HOST`, otherwise first HTTPS server)
-def test_custom_dhparam_is_supported_per_site(docker_compose):
+def test_custom_dhparam_is_supported_per_site(docker_compose, ca_root_certificate):
     container_name="dh-file"
     sut_container = docker_client.containers.get(container_name)
     assert sut_container.status == "running"
@@ -242,7 +241,7 @@ def test_custom_dhparam_is_supported_per_site(docker_compose):
     # - `web2` has it's own cert provisioned at `/etc/nginx/certs/web2.nginx-proxy.tld.crt`.
     can_verify_chain_of_trust(
         sut_container,
-        ca_cert = f"{os.getcwd()}/certs/ca-root.crt",
+        ca_cert = ca_root_certificate,
         fqdn    = 'web2.nginx-proxy.tld'
     )