diff --git a/testinfra/test_mirror.py b/testinfra/test_mirror.py index 52780dad70..359383ce9f 100644 --- a/testinfra/test_mirror.py +++ b/testinfra/test_mirror.py @@ -67,28 +67,32 @@ def test_quay_mirror(host): def test_galaxy_mirror(host): cmd = host.run(_run_cmd(host, 4448, url='/')) - assert 'Ansible Galaxy' in cmd.stdout + assert 'Galaxy NG' in cmd.stdout cmd = host.run(_run_cmd(host, 8085, scheme='http', url='/')) - assert 'Ansible Galaxy' in cmd.stdout + assert 'Galaxy NG' in cmd.stdout hostname = host.backend.get_hostname() # Ensure API properly answers cmd = host.run(_run_cmd(host, 4448, url='/api/')) - assert 'GALAXY REST API' in cmd.stdout - # Ensure we get data out of a specific collection - cmd = host.run(_run_cmd(host, 4448, url='/api/v2/collections/community/general/')) - assert 'https://{}:4448/api/'.format(hostname) in cmd.stdout - answer = json.loads(cmd.stdout) - version_uri = answer['latest_version']['href'].replace('https://{}:4448'.format(hostname), '') - # Ensure we get a correct download URI - cmd = host.run(_run_cmd(host, 4448, url=version_uri)) - assert 'https://{}:4448/api/'.format(hostname) in cmd.stdout - answer = json.loads(cmd.stdout) - download_uri = answer['download_url'] - assert download_uri.startswith('https://{}:4448/download/community-general'.format(hostname)) - # Download a file and check we get an actual archive - download_uri = download_uri.replace('https://{}:4448'.format(hostname), '') - host.run(_run_cmd(host, 4448, url=download_uri, curl_opt='-sL --output /tmp/output.tar.gz')) - check_file = host.run('file /tmp/output.tar.gz') - assert 'gzip compressed data' in check_file.stdout + assert 'galaxy_ng_version' in cmd.stdout + + # TODO(clarkb) fix the testing of galaxy api proxying. + # Galaxy completely redid their apis in v3 and the tests below are + # no longer valid. + ## Ensure we get data out of a specific collection + #cmd = host.run(_run_cmd(host, 4448, url='/api/v2/collections/community/general/')) + #assert 'https://{}:4448/api/'.format(hostname) in cmd.stdout + #answer = json.loads(cmd.stdout) + #version_uri = answer['latest_version']['href'].replace('https://{}:4448'.format(hostname), '') + ## Ensure we get a correct download URI + #cmd = host.run(_run_cmd(host, 4448, url=version_uri)) + #assert 'https://{}:4448/api/'.format(hostname) in cmd.stdout + #answer = json.loads(cmd.stdout) + #download_uri = answer['download_url'] + #assert download_uri.startswith('https://{}:4448/download/community-general'.format(hostname)) + ## Download a file and check we get an actual archive + #download_uri = download_uri.replace('https://{}:4448'.format(hostname), '') + #host.run(_run_cmd(host, 4448, url=download_uri, curl_opt='-sL --output /tmp/output.tar.gz')) + #check_file = host.run('file /tmp/output.tar.gz') + #assert 'gzip compressed data' in check_file.stdout