Skip to content

Commit a34d73d

Browse files
committed
make quadlet.example.com a fixture
1 parent 7f9a2d3 commit a34d73d

2 files changed

Lines changed: 17 additions & 12 deletions

File tree

tests/conftest.py

Lines changed: 9 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -14,12 +14,17 @@ def pytest_addoption(parser):
1414

1515

1616
@pytest.fixture(scope="module")
17-
def certificates(pytestconfig):
17+
def server_hostname():
18+
return 'quadlet.example.com'
19+
20+
21+
@pytest.fixture(scope="module")
22+
def certificates(pytestconfig, server_hostname):
1823
source = pytestconfig.getoption("certificate_source")
1924
env = Environment(loader=FileSystemLoader("."), autoescape=select_autoescape())
2025
template = env.get_template(f"./src/vars/{source}_certificates.yml")
2126
context = {'certificates_ca_directory': '/root/certificates',
22-
'ansible_fqdn': 'quadlet.example.com'}
27+
'ansible_fqdn': server_hostname}
2328
return yaml.safe_load(template.render(context))
2429

2530

@@ -40,14 +45,14 @@ def ssh_config():
4045

4146

4247
@pytest.fixture(scope="module")
43-
def foremanapi(ssh_config):
48+
def foremanapi(ssh_config, server_hostname):
4449
api = apypie.ForemanApi(
4550
uri=f'https://{ssh_config["hostname"]}',
4651
username='admin',
4752
password='changeme',
4853
verify_ssl=False,
4954
)
50-
api._session.headers['Host'] = 'quadlet.example.com'
55+
api._session.headers['Host'] = server_hostname
5156
return api
5257

5358
@pytest.fixture

tests/httpd_test.py

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -19,25 +19,25 @@ def test_https_port(server):
1919
assert httpd.port(HTTPS_PORT).is_reachable
2020

2121

22-
def test_https_foreman_ping(server, certificates):
23-
cmd = server.run(f"curl --cacert {certificates['ca_certificate']} --silent --output /dev/null --write-out '%{{http_code}}' https://quadlet.example.com/api/v2/ping")
22+
def test_https_foreman_ping(server, certificates, server_hostname):
23+
cmd = server.run(f"curl --cacert {certificates['ca_certificate']} --silent --output /dev/null --write-out '%{{http_code}}' https://{server_hostname}/api/v2/ping")
2424
assert cmd.succeeded
2525
assert cmd.stdout == '200'
2626

2727

28-
def test_https_pulp_status(server, certificates):
29-
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/")
28+
def test_https_pulp_status(server, certificates, server_hostname):
29+
cmd = server.run(f"curl --cacert {certificates['ca_certificate']} --silent --output /dev/null --write-out '%{{http_code}}' https://{server_hostname}/pulp/api/v3/status/")
3030
assert cmd.succeeded
3131
assert cmd.stdout == '200'
3232

3333

34-
def test_https_pulp_content(server, certificates):
35-
cmd = server.run(f"curl --cacert {certificates['ca_certificate']} --silent --output /dev/null --write-out '%{{http_code}}' https://quadlet.example.com/pulp/content/")
34+
def test_https_pulp_content(server, certificates, server_hostname):
35+
cmd = server.run(f"curl --cacert {certificates['ca_certificate']} --silent --output /dev/null --write-out '%{{http_code}}' https://{server_hostname}/pulp/content/")
3636
assert cmd.succeeded
3737
assert cmd.stdout == '200'
3838

3939

40-
def test_https_pulp_auth(server, certificates):
41-
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/")
40+
def test_https_pulp_auth(server, certificates, server_hostname):
41+
cmd = server.run(f"curl --cacert {certificates['ca_certificate']} --silent --write-out '%{{stderr}}%{{http_code}}' --cert {certificates['client_certificate']} --key {certificates['client_key']} https://{server_hostname}/pulp/api/v3/users/")
4242
assert cmd.succeeded
4343
assert cmd.stderr == '200'

0 commit comments

Comments
 (0)