From 6c1ff9f14012fb86cf26eaf04ce2fd71436dd7be Mon Sep 17 00:00:00 2001 From: nghazalibeiklar Date: Mon, 27 Jun 2022 11:54:40 +1000 Subject: [PATCH] Reverted all refactory related to tests --- .../bitbucket_latest/tests/test_default.py | 22 +++++++--------- .../confluence_latest/tests/test_default.py | 22 +++++++--------- .../crowd_latest/tests/test_default.py | 25 +++++++------------ 3 files changed, 27 insertions(+), 42 deletions(-) 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 cffe337..bb5b1d8 100644 --- a/roles/product_install/molecule/bitbucket_latest/tests/test_default.py +++ b/roles/product_install/molecule/bitbucket_latest/tests/test_default.py @@ -24,30 +24,26 @@ def test_version_file_is_latest(host): verfile = host.file('/media/atl/bitbucket/shared/bitbucket.version') assert verfile.exists - upstream = get_version("https://marketplace.atlassian.com/rest/2/products/key/bitbucket/versions") + upstream_fd = urllib.request.urlopen("https://marketplace.atlassian.com/rest/2/products/key/bitbucket/versions") + upstream_json = json.load(upstream_fd) + upstream = upstream_json['_embedded']['versions'][0]['name'] assert verfile.content.decode("UTF-8").strip() == upstream.strip() def test_latest_is_downloaded(host): - upstream = get_version("https://marketplace.atlassian.com/rest/2/products/key/bitbucket/versions") + upstream_fd = urllib.request.urlopen("https://marketplace.atlassian.com/rest/2/products/key/bitbucket/versions") + upstream_json = json.load(upstream_fd) + upstream = upstream_json['_embedded']['versions'][0]['name'] installer = host.file('/media/atl/downloads/bitbucket.' + upstream + '-x64.bin') assert installer.exists assert installer.user == 'root' def test_completed_lockfile(host): - upstream = get_version("https://marketplace.atlassian.com/rest/2/products/key/bitbucket/versions") + upstream_fd = urllib.request.urlopen("https://marketplace.atlassian.com/rest/2/products/key/bitbucket/versions") + upstream_json = json.load(upstream_fd) + upstream = upstream_json['_embedded']['versions'][0]['name'] lockfile = host.file('/media/atl/downloads/bitbucket.' + upstream + '-x64.bin_completed') assert lockfile.exists assert lockfile.user == 'root' - -def get_version(url): - if url.lower().startswith('http'): - upstream_req = urllib.request.Request(url) - else: - raise ValueError from None - with urllib.request.urlopen(upstream_req) as upstream_response: #nosec - 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 bf2462d..1b3ef88 100644 --- a/roles/product_install/molecule/confluence_latest/tests/test_default.py +++ b/roles/product_install/molecule/confluence_latest/tests/test_default.py @@ -24,30 +24,26 @@ def test_version_file_is_latest(host): verfile = host.file('/media/atl/confluence/shared-home/confluence.version') assert verfile.exists - upstream = get_version("https://marketplace.atlassian.com/rest/2/products/key/confluence/versions") + upstream_fd = urllib.request.urlopen("https://marketplace.atlassian.com/rest/2/products/key/confluence/versions") + upstream_json = json.load(upstream_fd) + upstream = upstream_json['_embedded']['versions'][0]['name'] assert verfile.content.decode("UTF-8").strip() == upstream.strip() def test_latest_is_downloaded(host): - upstream = get_version("https://marketplace.atlassian.com/rest/2/products/key/confluence/versions") + upstream_fd = urllib.request.urlopen("https://marketplace.atlassian.com/rest/2/products/key/confluence/versions") + upstream_json = json.load(upstream_fd) + upstream = upstream_json['_embedded']['versions'][0]['name'] installer = host.file('/media/atl/downloads/confluence.'+upstream+'-x64.bin') assert installer.exists assert installer.user == 'root' def test_completed_lockfile(host): - upstream = get_version("https://marketplace.atlassian.com/rest/2/products/key/confluence/versions") + upstream_fd = urllib.request.urlopen("https://marketplace.atlassian.com/rest/2/products/key/confluence/versions") + upstream_json = json.load(upstream_fd) + upstream = upstream_json['_embedded']['versions'][0]['name'] lockfile = host.file('/media/atl/downloads/confluence.'+upstream+'-x64.bin_completed') assert lockfile.exists assert lockfile.user == 'root' - -def get_version(url): - if url.lower().startswith('http'): - upstream_req = urllib.request.Request(url) - else: - raise ValueError from None - 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 ee51787..34ffcbc 100644 --- a/roles/product_install/molecule/crowd_latest/tests/test_default.py +++ b/roles/product_install/molecule/crowd_latest/tests/test_default.py @@ -24,33 +24,26 @@ def test_version_file_is_latest(host): verfile = host.file('/media/atl/crowd/shared/crowd.version') assert verfile.exists - upstream = get_version("https://marketplace.atlassian.com/rest/2/products/key/crowd/versions") + upstream_fd = urllib.request.urlopen("https://marketplace.atlassian.com/rest/2/products/key/crowd/versions") + upstream_json = json.load(upstream_fd) + upstream = upstream_json['_embedded']['versions'][0]['name'] assert verfile.content.decode("UTF-8").strip() == upstream.strip() def test_latest_is_downloaded(host): - upstream = get_version("https://marketplace.atlassian.com/rest/2/products/key/crowd/versions") + upstream_fd = urllib.request.urlopen("https://marketplace.atlassian.com/rest/2/products/key/crowd/versions") + upstream_json = json.load(upstream_fd) + upstream = upstream_json['_embedded']['versions'][0]['name'] installer = host.file('/media/atl/downloads/crowd.' + upstream + '.tar.gz') assert installer.exists assert installer.user == 'root' def test_completed_lockfile(host): - upstream = get_version("https://marketplace.atlassian.com/rest/2/products/key/crowd/versions") + upstream_fd = urllib.request.urlopen("https://marketplace.atlassian.com/rest/2/products/key/crowd/versions") + upstream_json = json.load(upstream_fd) + upstream = upstream_json['_embedded']['versions'][0]['name'] lockfile = host.file('/media/atl/downloads/crowd.' + upstream + '.tar.gz_completed') assert lockfile.exists assert lockfile.user == 'root' - -def get_version(url): - if url.lower().startswith('http'): - try: - upstream_req = urllib.request.Request(url) - except: - return None - else: - raise ValueError from None - 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