Skip to content
This repository was archived by the owner on Feb 27, 2023. It is now read-only.

Commit 4c90f3f

Browse files
committed
#11 Fix unit tests
Signed-off-by: Uilian Ries <uilianries@gmail.com>
1 parent a8044be commit 4c90f3f

3 files changed

Lines changed: 21 additions & 27 deletions

File tree

bintray/bintray.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -294,7 +294,7 @@ def delete_user_proprietary_license(self, user, custom_license_name):
294294
:return: request answer
295295
"""
296296
url = "{}/users/{}/licenses/{}".format(Bintray.BINTRAY_URL, user, custom_license_name)
297-
return self._requester.patch(url)
297+
return self._requester.delete(url)
298298

299299
def get_oss_licenses(self):
300300
""" Returns a list of all the OSS licenses.

tests/test_files.py

Lines changed: 14 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ def test_bad_credentials_for_get_package_files():
2828
error_message = str(error)
2929
assert "Could not GET (401): 401 Client Error: Unauthorized for url: " \
3030
"https://api.bintray.com/packages/uilianries/generic/statistics/files?" \
31-
"include_unpublished=False&include_unpublished=0" == error_message
31+
"include_unpublished=0" == error_message
3232

3333

3434
def test_get_version_files():
@@ -46,6 +46,7 @@ def test_get_version_files():
4646
'size': 1967,
4747
'version': '20190701'} in response
4848

49+
4950
def test_bad_credentials_for_get_version_files():
5051
bintray = Bintray("foobar", "85abc6aece02515e8bd87b9754a18af697527d88")
5152
error_message = ""
@@ -55,12 +56,12 @@ def test_bad_credentials_for_get_version_files():
5556
error_message = str(error)
5657
assert "Could not GET (401): 401 Client Error: Unauthorized for url: " \
5758
"https://api.bintray.com/packages/uilianries/generic/statistics/versions" \
58-
"/20190701/files?include_unpublished=False&include_unpublished=0" == error_message
59+
"/20190701/files?include_unpublished=0" == error_message
5960

6061

6162
def test_file_search_by_name():
6263
bintray = Bintray()
63-
response = bintray.file_search_by_name("statistics", subject="uilianries", repo="generic")
64+
response = bintray.file_search_by_name("packages.json", subject="uilianries", repo="generic")
6465
assert {'error': False, 'statusCode': 200} in response
6566
assert {'created': '2019-07-01T20:51:42.879Z',
6667
'name': 'packages.json',
@@ -78,47 +79,39 @@ def test_bad_credentials_file_search_by_name():
7879
bintray = Bintray("foobar", "85abc6aece02515e8bd87b9754a18af697527d88")
7980
error_message = ""
8081
try:
81-
bintray.file_search_by_name("statistics", subject="uilianries", repo="generic")
82+
bintray.file_search_by_name("packages.json", subject="uilianries", repo="generic")
8283
except Exception as error:
8384
error_message = str(error)
8485
assert "Could not GET (401): 401 Client Error: Unauthorized for url: " \
85-
"https://api.bintray.com/packages/uilianries/generic/statistics/versions" \
86-
"/20190701/files?include_unpublished=False&include_unpublished=0" == error_message
86+
"https://api.bintray.com/search/file" \
87+
"?name=packages.json&subject=uilianries&repo=generic" == error_message
8788

8889

8990
def test_file_search_by_checksum():
9091
bintray = Bintray()
9192
response = bintray.file_search_by_checksum("85abc6aece02515e8bd87b9754a18af697527d88",
92-
subject="uilianries", repo="generic")
93+
subject="uilianries", repo="generic",
94+
created_after="2019-07-01")
9395
assert {'error': False, 'statusCode': 200} in response
94-
assert {'created': '2019-07-01T20:51:42.879Z',
95-
'name': 'packages.json',
96-
'owner': 'uilianries',
97-
'package': 'statistics',
98-
'path': 'packages.json',
99-
'repo': 'generic',
100-
'sha1': '85abc6aece02515e8bd87b9754a18af697527d88',
101-
'sha256': '9537027db06c520b6eeb3b8317cef5c994ab93e5ad4b17fac3567fba7089b165',
102-
'size': 1967,
103-
'version': '20190701'} in response
10496

10597

10698
def test_bad_credentials_file_search_by_checksum():
10799
bintray = Bintray("foobar", "85abc6aece02515e8bd87b9754a18af697527d88")
108100
error_message = ""
109101
try:
110-
response = bintray.file_search_by_checksum(
102+
bintray.file_search_by_checksum(
111103
"85abc6aece02515e8bd87b9754a18af697527d88",
112104
subject="uilianries", repo="generic")
113105
except Exception as error:
114106
error_message = str(error)
115107
assert "Could not GET (401): 401 Client Error: Unauthorized for url: " \
116-
"https://api.bintray.com/packages/uilianries/generic/statistics/versions" \
117-
"/20190701/files?include_unpublished=False&include_unpublished=0" == error_message
108+
"https://api.bintray.com/search/file" \
109+
"?sha1=85abc6aece02515e8bd87b9754a18af697527d88" \
110+
"&subject=uilianries&repo=generic" == error_message
118111

119112

120113
def test_file_in_download_list():
121114
bintray = Bintray()
122115
response = bintray.file_in_download_list("uilianries", "generic", "packages.json", True)
123-
assert {'error': False, 'statusCode': 200} in response
116+
assert {'error': False, 'message': 'success', 'statusCode': 200} == response
124117

tests/test_licenses.py

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,7 @@ def test_update_org_proprietary_licenses():
7575
error_message = str(error)
7676

7777
assert "Could not PATCH (405): 405 Client Error: Method Not Allowed for url: " \
78-
"https://api.bintray.com/orgs/jfrog/licenses/foobar"
78+
"https://api.bintray.com/orgs/jfrog/licenses/foobar" == error_message
7979

8080

8181
def test_update_user_proprietary_licenses():
@@ -88,7 +88,7 @@ def test_update_user_proprietary_licenses():
8888
error_message = str(error)
8989

9090
assert "Could not PATCH (405): 405 Client Error: Method Not Allowed for url: " \
91-
"https://api.bintray.com/users/uilianries/licenses/foobar"
91+
"https://api.bintray.com/users/uilianries/licenses/foobar" == error_message
9292

9393

9494
def test_delete_org_proprietary_licenses():
@@ -99,7 +99,8 @@ def test_delete_org_proprietary_licenses():
9999
except Exception as error:
100100
error_message = str(error)
101101
assert "Could not DELETE (403): 403 Client Error: Forbidden for url: " \
102-
"https://api.bintray.com/orgs/jfrog/licenses/foobar"
102+
"https://api.bintray.com/orgs/jfrog/licenses/foobar" == error_message
103+
103104

104105
def test_delete_user_proprietary_licenses():
105106
bintray = Bintray()
@@ -108,5 +109,5 @@ def test_delete_user_proprietary_licenses():
108109
bintray.delete_user_proprietary_license(user="uilianries", custom_license_name="foobar")
109110
except Exception as error:
110111
error_message = str(error)
111-
assert "Could not DELETE (403): 403 Client Error: Forbidden for url: " \
112-
"https://api.bintray.com/users/uilianries/licenses/foobar"
112+
assert "Could not DELETE (400): 400 Client Error: Bad Request for url: " \
113+
"https://api.bintray.com/users/uilianries/licenses/foobar" == error_message

0 commit comments

Comments
 (0)