x/deb-python-tempest-lib
Code Issues Proposed changes

Added __init__.py to tests/services/identity/

Browse Source 
This is necessary for the tests to actually be run.

Also use sort_keys=True for json.dumps() in both the auth() methods and the
unit tests that compare the expected and actual request bodies. Otherwise
the order of the keys is unpredictable and the tests fail randomly.

Change-Id: Ieb27be22367b419326939c4261388286e6c996c4
This commit is contained in:
Adrien Cunin
2016-01-25 09:53:53 +01:00
parent f4b5b12aaf
commit 7c42ae0dad
5 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
tempest_lib/services/identity/v2/token_client.py
View File

@@ -47,7 +47,7 @@ class TokenClient(rest_client.RestClient):
if tenant:
creds['auth']['tenantName'] = tenant
body = json.dumps(creds)
body = json.dumps(creds, sort_keys=True)
resp, body = self.post(self.auth_url, body=body)
self.expected_success(200, resp.status)

2
tempest_lib/services/identity/v3/token_client.py
View File

@@ -113,7 +113,7 @@ class V3TokenClient(rest_client.RestClient):
elif domain_name:
creds['auth']['scope'] = dict(domain={'name': domain_name})
body = json.dumps(creds)
body = json.dumps(creds, sort_keys=True)
resp, body = self.post(self.auth_url, body=body)
self.expected_success(201, resp.status)
return rest_client.ResponseBody(resp, body)

0
tempest_lib/tests/services/identity/__init__.py Normal file
View File

4
tempest_lib/tests/services/identity/v2/test_token_client.py
View File

@@ -43,7 +43,7 @@ class TestTokenClientV2(base.TestCase):
'password': 'fake_pass',
},
}
})
}, sort_keys=True)
post_mock.mock.assert_called_once_with('fake_url/tokens',
body=req_dict)
@@ -62,7 +62,7 @@ class TestTokenClientV2(base.TestCase):
'password': 'fake_pass',
},
}
})
}, sort_keys=True)
post_mock.mock.assert_called_once_with('fake_url/tokens',
body=req_dict)

4
tempest_lib/tests/services/identity/v3/test_token_client.py
View File

@@ -48,7 +48,7 @@ class TestTokenClientV2(base.TestCase):
}
},
}
})
}, sort_keys=True)
post_mock.mock.assert_called_once_with('fake_url/auth/tokens',
body=req_dict)
@@ -76,7 +76,7 @@ class TestTokenClientV2(base.TestCase):
}
},
}
})
}, sort_keys=True)
post_mock.mock.assert_called_once_with('fake_url/auth/tokens',
body=req_dict)