Reverted all refactory related to tests

This commit is contained in:
nghazalibeiklar
2022-06-27 11:54:40 +10:00
parent a4dec76f47
commit 6c1ff9f140
3 changed files with 27 additions and 42 deletions

View File

@@ -24,30 +24,26 @@ def test_version_file_is_latest(host):
verfile = host.file('/media/atl/bitbucket/shared/bitbucket.version') verfile = host.file('/media/atl/bitbucket/shared/bitbucket.version')
assert verfile.exists 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() assert verfile.content.decode("UTF-8").strip() == upstream.strip()
def test_latest_is_downloaded(host): 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') installer = host.file('/media/atl/downloads/bitbucket.' + upstream + '-x64.bin')
assert installer.exists assert installer.exists
assert installer.user == 'root' assert installer.user == 'root'
def test_completed_lockfile(host): 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') lockfile = host.file('/media/atl/downloads/bitbucket.' + upstream + '-x64.bin_completed')
assert lockfile.exists assert lockfile.exists
assert lockfile.user == 'root' 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

View File

@@ -24,30 +24,26 @@ def test_version_file_is_latest(host):
verfile = host.file('/media/atl/confluence/shared-home/confluence.version') verfile = host.file('/media/atl/confluence/shared-home/confluence.version')
assert verfile.exists 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() assert verfile.content.decode("UTF-8").strip() == upstream.strip()
def test_latest_is_downloaded(host): 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') installer = host.file('/media/atl/downloads/confluence.'+upstream+'-x64.bin')
assert installer.exists assert installer.exists
assert installer.user == 'root' assert installer.user == 'root'
def test_completed_lockfile(host): 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') lockfile = host.file('/media/atl/downloads/confluence.'+upstream+'-x64.bin_completed')
assert lockfile.exists assert lockfile.exists
assert lockfile.user == 'root' 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

View File

@@ -24,33 +24,26 @@ def test_version_file_is_latest(host):
verfile = host.file('/media/atl/crowd/shared/crowd.version') verfile = host.file('/media/atl/crowd/shared/crowd.version')
assert verfile.exists 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() assert verfile.content.decode("UTF-8").strip() == upstream.strip()
def test_latest_is_downloaded(host): 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') installer = host.file('/media/atl/downloads/crowd.' + upstream + '.tar.gz')
assert installer.exists assert installer.exists
assert installer.user == 'root' assert installer.user == 'root'
def test_completed_lockfile(host): 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') lockfile = host.file('/media/atl/downloads/crowd.' + upstream + '.tar.gz_completed')
assert lockfile.exists assert lockfile.exists
assert lockfile.user == 'root' 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