mirror of
https://github.com/galaxyproject/galaxy.git
synced 2026-09-24 16:30:27 +08:00
Fix all E201 and E202 style errors
using the following command: ``` autopep8 -i -r --exclude $(sed -e 's|^|./|' -e 's|/$||' .ci/flake8_blacklist.txt | paste -sd,) --select E201,E202 . ```
This commit is contained in:
committed by
Nicola Soranzo
parent
008a1d849c
commit
21b44bf348
+16
-16
@@ -4,44 +4,44 @@ ASSERT_FAIL_ERROR_CODE = "Expected Galaxy error code %d, obtained %d"
|
||||
ASSERT_FAIL_STATUS_CODE = "Request status code (%d) was not expected value %s. Body was %s"
|
||||
|
||||
|
||||
def assert_status_code_is( response, expected_status_code ):
|
||||
def assert_status_code_is(response, expected_status_code):
|
||||
response_status_code = response.status_code
|
||||
if expected_status_code != response_status_code:
|
||||
_report_status_code_error( response, expected_status_code )
|
||||
_report_status_code_error(response, expected_status_code)
|
||||
|
||||
|
||||
def assert_status_code_is_ok( response ):
|
||||
def assert_status_code_is_ok(response):
|
||||
response_status_code = response.status_code
|
||||
is_two_hundred_status_code = response_status_code >= 200 and response_status_code <= 300
|
||||
if not is_two_hundred_status_code:
|
||||
_report_status_code_error( response, "2XX" )
|
||||
_report_status_code_error(response, "2XX")
|
||||
|
||||
|
||||
def _report_status_code_error( response, expected_status_code ):
|
||||
def _report_status_code_error(response, expected_status_code):
|
||||
try:
|
||||
body = response.json()
|
||||
except Exception:
|
||||
body = "INVALID JSON RESPONSE <%s>" % response.content
|
||||
assertion_message = ASSERT_FAIL_STATUS_CODE % ( response.status_code, expected_status_code, body )
|
||||
raise AssertionError( assertion_message )
|
||||
assertion_message = ASSERT_FAIL_STATUS_CODE % (response.status_code, expected_status_code, body)
|
||||
raise AssertionError(assertion_message)
|
||||
|
||||
|
||||
def assert_has_keys( response, *keys ):
|
||||
def assert_has_keys(response, *keys):
|
||||
for key in keys:
|
||||
assert key in response, "Response [%s] does not contain key [%s]" % ( response, key )
|
||||
assert key in response, "Response [%s] does not contain key [%s]" % (response, key)
|
||||
|
||||
|
||||
def assert_not_has_keys( response, *keys ):
|
||||
def assert_not_has_keys(response, *keys):
|
||||
for key in keys:
|
||||
assert key not in response, "Response [%s] contains invalid key [%s]" % ( response, key )
|
||||
assert key not in response, "Response [%s] contains invalid key [%s]" % (response, key)
|
||||
|
||||
|
||||
def assert_error_code_is( response, error_code ):
|
||||
if hasattr( response, "json" ):
|
||||
def assert_error_code_is(response, error_code):
|
||||
if hasattr(response, "json"):
|
||||
response = response.json()
|
||||
assert_has_keys( response, "err_code" )
|
||||
err_code = response[ "err_code" ]
|
||||
assert err_code == int( error_code ), ASSERT_FAIL_ERROR_CODE % ( err_code, int( error_code ) )
|
||||
assert_has_keys(response, "err_code")
|
||||
err_code = response["err_code"]
|
||||
assert err_code == int(error_code), ASSERT_FAIL_ERROR_CODE % (err_code, int(error_code))
|
||||
|
||||
|
||||
assert_has_key = assert_has_keys
|
||||
|
||||
Reference in New Issue
Block a user