diff --git a/roles/product_install/molecule/bitbucket_latest/tests/test_default.py b/roles/product_install/molecule/bitbucket_latest/tests/test_default.py index 37b33f9..7a2dddb 100644 --- a/roles/product_install/molecule/bitbucket_latest/tests/test_default.py +++ b/roles/product_install/molecule/bitbucket_latest/tests/test_default.py @@ -24,29 +24,28 @@ def test_version_file_is_latest(host): verfile = host.file('/media/atl/bitbucket/shared/bitbucket.version') assert verfile.exists - upstream_req = urllib.request.Request("https://marketplace.atlassian.com/rest/2/products/key/bitbucket/versions") - with urllib.request.urlopen(upstream_req) as upstream_response: - upstream_json = json.load(upstream_response) - upstream = upstream_json['_embedded']['versions'][0]['name'] + upstream = get_version("https://marketplace.atlassian.com/rest/2/products/key/bitbucket/versions") assert verfile.content.decode("UTF-8").strip() == upstream.strip() def test_latest_is_downloaded(host): - upstream_req = urllib.request.Request("https://marketplace.atlassian.com/rest/2/products/key/bitbucket/versions") - with urllib.request.urlopen(upstream_req) as upstream_response: - upstream_json = json.load(upstream_response) - upstream = upstream_json['_embedded']['versions'][0]['name'] + upstream = get_version("https://marketplace.atlassian.com/rest/2/products/key/bitbucket/versions") installer = host.file('/media/atl/downloads/bitbucket.' + upstream + '-x64.bin') assert installer.exists assert installer.user == 'root' def test_completed_lockfile(host): - upstream_req = urllib.request.Request("https://marketplace.atlassian.com/rest/2/products/key/bitbucket/versions") - with urllib.request.urlopen(upstream_req) as upstream_response: - upstream_json = json.load(upstream_response) - upstream = upstream_json['_embedded']['versions'][0]['name'] + upstream = get_version("https://marketplace.atlassian.com/rest/2/products/key/bitbucket/versions") lockfile = host.file('/media/atl/downloads/bitbucket.' + upstream + '-x64.bin_completed') assert lockfile.exists assert lockfile.user == 'root' + +def get_version(url): + assert url.lower().startswith('http') + upstream_req = urllib.request.Request(url) + with urllib.request.urlopen(upstream_req) as upstream_response: + upstream_json = json.load(upstream_response) + upstream = upstream_json['_embedded']['versions'][0]['name'] + return upstream diff --git a/roles/product_install/molecule/confluence_latest/tests/test_default.py b/roles/product_install/molecule/confluence_latest/tests/test_default.py index 6d59c2a..6509d77 100644 --- a/roles/product_install/molecule/confluence_latest/tests/test_default.py +++ b/roles/product_install/molecule/confluence_latest/tests/test_default.py @@ -24,29 +24,28 @@ def test_version_file_is_latest(host): verfile = host.file('/media/atl/confluence/shared-home/confluence.version') assert verfile.exists - upstream_req = urllib.request.Request("https://marketplace.atlassian.com/rest/2/products/key/confluence/versions") - with urllib.request.urlopen(upstream_req) as upstream_response: - upstream_json = json.load(upstream_response) - upstream = upstream_json['_embedded']['versions'][0]['name'] + upstream = get_version("https://marketplace.atlassian.com/rest/2/products/key/confluence/versions") assert verfile.content.decode("UTF-8").strip() == upstream.strip() def test_latest_is_downloaded(host): - upstream_req = urllib.request.Request("https://marketplace.atlassian.com/rest/2/products/key/confluence/versions") - with urllib.request.urlopen(upstream_req) as upstream_response: - upstream_json = json.load(upstream_response) - upstream = upstream_json['_embedded']['versions'][0]['name'] + upstream = get_version("https://marketplace.atlassian.com/rest/2/products/key/confluence/versions") installer = host.file('/media/atl/downloads/confluence.'+upstream+'-x64.bin') assert installer.exists assert installer.user == 'root' def test_completed_lockfile(host): - upstream_req = urllib.request.Request("https://marketplace.atlassian.com/rest/2/products/key/confluence/versions") - with urllib.request.urlopen(upstream_req) as upstream_response: - upstream_json = json.load(upstream_response) - upstream = upstream_json['_embedded']['versions'][0]['name'] + upstream = get_version("https://marketplace.atlassian.com/rest/2/products/key/confluence/versions") lockfile = host.file('/media/atl/downloads/confluence.'+upstream+'-x64.bin_completed') assert lockfile.exists assert lockfile.user == 'root' + +def get_version(url): + assert url.lower().startswith('http') + upstream_req = urllib.request.Request(url) + with urllib.request.urlopen(upstream_req) as upstream_response: + upstream_json = json.load(upstream_response) + upstream = upstream_json['_embedded']['versions'][0]['name'] + return upstream diff --git a/roles/product_install/molecule/crowd_latest/tests/test_default.py b/roles/product_install/molecule/crowd_latest/tests/test_default.py index 36e7215..dfb360e 100644 --- a/roles/product_install/molecule/crowd_latest/tests/test_default.py +++ b/roles/product_install/molecule/crowd_latest/tests/test_default.py @@ -24,29 +24,28 @@ def test_version_file_is_latest(host): verfile = host.file('/media/atl/crowd/shared/crowd.version') assert verfile.exists - upstream_req = urllib.request.Request("https://marketplace.atlassian.com/rest/2/products/key/crowd/versions") - with urllib.request.urlopen(upstream_req) as upstream_response: - upstream_json = json.load(upstream_response) - upstream = upstream_json['_embedded']['versions'][0]['name'] + upstream = get_version("https://marketplace.atlassian.com/rest/2/products/key/crowd/versions") assert verfile.content.decode("UTF-8").strip() == upstream.strip() def test_latest_is_downloaded(host): - upstream_req = urllib.request.Request("https://marketplace.atlassian.com/rest/2/products/key/crowd/versions") - with urllib.request.urlopen(upstream_req) as upstream_response: - upstream_json = json.load(upstream_response) - upstream = upstream_json['_embedded']['versions'][0]['name'] + upstream = get_version("https://marketplace.atlassian.com/rest/2/products/key/crowd/versions") installer = host.file('/media/atl/downloads/crowd.' + upstream + '.tar.gz') assert installer.exists assert installer.user == 'root' def test_completed_lockfile(host): - upstream_req = urllib.request.Request("https://marketplace.atlassian.com/rest/2/products/key/crowd/versions") - with urllib.request.urlopen(upstream_req) as upstream_response: - upstream_json = json.load(upstream_response) - upstream = upstream_json['_embedded']['versions'][0]['name'] + upstream = get_version("https://marketplace.atlassian.com/rest/2/products/key/crowd/versions") lockfile = host.file('/media/atl/downloads/crowd.' + upstream + '.tar.gz_completed') assert lockfile.exists assert lockfile.user == 'root' + +def get_version(url): + assert url.lower().startswith('http') + upstream_req = urllib.request.Request(url) + with urllib.request.urlopen(upstream_req) as upstream_response: + upstream_json = json.load(upstream_response) + upstream = upstream_json['_embedded']['versions'][0]['name'] + return upstream \ No newline at end of file