mirror
/
py-gitea
kopia lustrzana https://github.com/Langenfeld/py-gitea
1
0
Forkuj 0
Kod Zgłoszenia Packages Projekty Wydania Wiki Aktywność

small changes for 1.9.0

pull/3/head
Langenfeld 2019-08-09 10:34:38 +02:00
rodzic 9a5b37b28f
commit a66b73e0f8
2 zmienionych plików z 11 dodań i 48 usunięć
Pokaż statystyki Ściągnij plik aktualizacji Ściągnij plik porównania Expand all files Collapse all files

57
gitea/gitea.py
Wyświetl plik

@ -360,67 +360,30 @@ class Gitea:
return {} return {}
def requests_get(self, endpoint, params={}): def requests_get(self, endpoint, params={}):
""" Get parsed result from API-endpoint. request = self.requests.get(self.__get_url(endpoint), headers=self.headers, params=params)
Args:
endpoint (str): Endpoint to request from.
Returns: (dict)
Parsed JSON-answer from the API.
Throws:
Exception, if answer status code is not ok.
"""
request = self.requests.get(
self.__get_url(endpoint), headers=self.headers, params=params
)
if request.status_code not in [200, 201]: if request.status_code not in [200, 201]:
logging.error("Received status code: %s (%s)" % (request.status_code, request.url)) message = "Received status code: %s (%s)" % (request.status_code, request.url)
logging.error(message)
if request.status_code in [404]: if request.status_code in [404]:
raise NotFoundException() raise NotFoundException()
if request.status_code in [403]: if request.status_code in [403]:
raise Exception("Unauthorized: %s - Check your permissions and try again!"% request.url) raise Exception("Unauthorized: %s - Check your permissions and try again!"% request.url)
raise Exception("Received status code: %s (%s)" % (request.status_code, request.url)) raise Exception(message)
return self.parse_result(request) return self.parse_result(request)
def requests_put(self, endpoint): def requests_put(self, endpoint):
""" Get parsed result from API-endpoint.
Args:
endpoint (str): Endpoint to request from.
Throws:
Exception, if answer status code is not ok.
"""
request = self.requests.put(self.__get_url(endpoint), headers=self.headers) request = self.requests.put(self.__get_url(endpoint), headers=self.headers)
if request.status_code not in [204]: if request.status_code not in [204]:
logging.error( message = "Received status code: %s (%s) %s"%(request.status_code, request.url, request.text)
"Received status code: %s (%s) %s" logging.error(message)
% (request.status_code, request.url, request.text) raise Exception(message)
)
raise Exception(
"Received status code: %s (%s) %s"
% (request.status_code, request.url, request.text)
)
def requests_delete(self, endpoint): def requests_delete(self, endpoint):
""" Get parsed result from API-endpoint.
Args:
endpoint (str): Endpoint to request from.
Throws:
Exception, if answer status code is not ok.
"""
request = self.requests.delete(self.__get_url(endpoint), headers=self.headers) request = self.requests.delete(self.__get_url(endpoint), headers=self.headers)
if request.status_code not in [204]: if request.status_code not in [204]:
logging.error( message = "Received status code: %s (%s)" % (request.status_code, request.url)
"Received status code: %s (%s)" % (request.status_code, request.url) logging.error(message)
) raise Exception(message)
raise Exception(
"Received status code: %s (%s) %s"
% (request.status_code, request.url, vars(request))
)
def requests_post(self, endpoint, data): def requests_post(self, endpoint, data):
""" Post data to API-endpoint. """ Post data to API-endpoint.

2
test_api.py
Wyświetl plik

@ -34,7 +34,7 @@ def test_token_owner():
assert user.is_admin, "Testuser is not Admin - Tests may fail" assert user.is_admin, "Testuser is not Admin - Tests may fail"
def test_gitea_version(): def test_gitea_version():
assert gitea.get_version() == "1.8.2", "Version changed. Updated?" assert gitea.get_version() == "1.9.0", "Version changed. Updated?"
def test_fail_get_non_existent_user(): def test_fail_get_non_existent_user():
with pytest.raises(NotFoundException) as e: with pytest.raises(NotFoundException) as e: