use the new certificates fixture

Author: evgeni

tests/candlepin_test.py

@@ -18,8 +18,8 @@ def test_candlepin_port(server):
     assert candlepin.port("23443").is_reachable
 
 
-def test_candlepin_status(server):
-    status = server.run('curl --cacert /root/certificates/certs/ca.crt --silent --output /dev/null --write-out \'%{http_code}\' https://localhost:23443/candlepin/status')
+def test_candlepin_status(server, certificates):
+    status = server.run(f"curl --cacert {certificates['ca_certificate']} --silent --output /dev/null --write-out '%{{http_code}}' https://localhost:23443/candlepin/status")
     assert status.succeeded
     assert status.stdout == '200'
 
@@ -29,8 +29,8 @@ def test_artemis_port(server):
     assert candlepin.port("61613").is_reachable
 
 
-def test_artemis_auth(server):
-    cmd = server.run('echo "" | openssl s_client -CAfile /root/certificates/certs/ca.crt -cert /root/certificates/certs/quadlet.example.com-client.crt -key /root/certificates/private/quadlet.example.com-client.key -connect localhost:61613')
+def test_artemis_auth(server, certificates):
+    cmd = server.run(f'echo "" | openssl s_client -CAfile {certificates["ca_certificate"]} -cert {certificates["client_certificate"]} -key {certificates["client_key"]} -connect localhost:61613')
     assert cmd.succeeded, f"exit: {cmd.rc}\n\nstdout:\n{cmd.stdout}\n\nstderr:\n{cmd.stderr}"
 
 

tests/foreman_proxy_test.py

@@ -13,8 +13,8 @@ def foreman_proxy_version_curl(server):
 
 
 @pytest.fixture(scope="module")
-def foreman_proxy_features_curl(server):
-    return server.run(f"curl -k -s -w '%{{stderr}}%{{http_code}}' --cert /root/certificates/certs/quadlet.example.com-client.crt --key /root/certificates/private/quadlet.example.com-client.key https://{FOREMAN_PROXY_HOST}:{FOREMAN_PROXY_PORT}/v2/features")
+def foreman_proxy_features_curl(server, certificates):
+    return server.run(f"curl -k -s -w '%{{stderr}}%{{http_code}}' --cert {certificates['client_certificate']} --key {certificates['client_key']} https://{FOREMAN_PROXY_HOST}:{FOREMAN_PROXY_PORT}/v2/features")
 
 
 def test_foreman_proxy_service(server):

tests/httpd_test.py

@@ -19,25 +19,25 @@ def test_https_port(server):
     assert httpd.port(HTTPS_PORT).is_reachable
 
 
-def test_https_foreman_ping(server):
-    cmd = server.run('curl --cacert /root/certificates/certs/ca.crt --silent --output /dev/null --write-out \'%{http_code}\' https://quadlet.example.com/api/v2/ping')
+def test_https_foreman_ping(server, certificates):
+    cmd = server.run(f"curl --cacert {certificates['ca_certificate']} --silent --output /dev/null --write-out '%{{http_code}}' https://quadlet.example.com/api/v2/ping")
     assert cmd.succeeded
     assert cmd.stdout == '200'
 
 
-def test_https_pulp_status(server):
-    cmd = server.run('curl --cacert /root/certificates/certs/ca.crt --silent --output /dev/null --write-out \'%{http_code}\' https://quadlet.example.com/pulp/api/v3/status/')
+def test_https_pulp_status(server, certificates):
+    cmd = server.run(f"curl --cacert {certificates['ca_certificate']} --silent --output /dev/null --write-out '%{{http_code}}' https://quadlet.example.com/pulp/api/v3/status/")
     assert cmd.succeeded
     assert cmd.stdout == '200'
 
 
-def test_https_pulp_content(server):
-    cmd = server.run('curl --cacert /root/certificates/certs/ca.crt --silent --output /dev/null --write-out \'%{http_code}\' https://quadlet.example.com/pulp/content/')
+def test_https_pulp_content(server, certificates):
+    cmd = server.run(f"curl --cacert {certificates['ca_certificate']} --silent --output /dev/null --write-out '%{{http_code}}' https://quadlet.example.com/pulp/content/")
     assert cmd.succeeded
     assert cmd.stdout == '200'
 
 
-def test_https_pulp_auth(server):
-    cmd = server.run(f"curl --cacert /root/certificates/certs/ca.crt --silent --write-out '%{{stderr}}%{{http_code}}' --cert /root/certificates/certs/quadlet.example.com-client.crt --key /root/certificates/private/quadlet.example.com-client.key https://quadlet.example.com/pulp/api/v3/users/")
+def test_https_pulp_auth(server, certificates):
+    cmd = server.run(f"curl --cacert {certificates['ca_certificate']} --silent --write-out '%{{stderr}}%{{http_code}}' --cert {certificates['client_certificate']} --key {certificates['client_key']} https://quadlet.example.com/pulp/api/v3/users/")
     assert cmd.succeeded
     assert cmd.stderr == '200'