diff options
Diffstat (limited to 'testapi')
| -rw-r--r-- | testapi/testapi-client/testapiclient/http_client.py | 2 | ||||
| -rw-r--r-- | testapi/testapi-client/testapiclient/identity.py | 20 |
2 files changed, 12 insertions, 10 deletions
diff --git a/testapi/testapi-client/testapiclient/http_client.py b/testapi/testapi-client/testapiclient/http_client.py index 59b4f8e..aa6ef11 100644 --- a/testapi/testapi-client/testapiclient/http_client.py +++ b/testapi/testapi-client/testapiclient/http_client.py @@ -44,7 +44,7 @@ class HTTPClient(object): headers=HTTPClient.headers).text def delete(self, url, *args): - if(args.__len__ > 0): + if(args.__len__() > 0): r = self._session_request('delete', url, data=json.dumps(args[0]), headers=HTTPClient.headers) diff --git a/testapi/testapi-client/testapiclient/identity.py b/testapi/testapi-client/testapiclient/identity.py index 03b3ac5..f38d8e1 100644 --- a/testapi/testapi-client/testapiclient/identity.py +++ b/testapi/testapi-client/testapiclient/identity.py @@ -17,19 +17,21 @@ def _authenticate(username, password): 'form_id': 'user_login' } response = session.post(hostname, data) - user.User.session = session + if "login" not in response.text: + user.User.session = session return response def authenticate(xstep): @functools.wraps(xstep) def wrapper(self, parsed_args): - username = parsed_args.u - password = parsed_args.p - if(username and password): - response = _authenticate(username, password) - if "login" in response.text: - print "Authentication has failed." - else: - xstep(self, parsed_args) + if(user.User.session is None): + username = parsed_args.u + password = parsed_args.p + if(username and password): + response = _authenticate(username, password) + if "login" in response.text: + print "Authentication has failed." + return + xstep(self, parsed_args) return wrapper |