diff options
| author | Dolph Mathews <dolph.mathews@gmail.com> | 2012-03-07 10:32:10 -0600 |
|---|---|---|
| committer | Dolph Mathews <dolph.mathews@gmail.com> | 2012-03-07 10:32:32 -0600 |
| commit | 9c07999dd5f5357fa7eee055fe9a4fdaa6a1a562 (patch) | |
| tree | 280e2349a4686768b6ec5c63df6edf6edc0fa681 /tests | |
| parent | 96a106e529e36298583701d7af5d33ba9a02bc72 (diff) | |
| download | python-keystoneclient-9c07999dd5f5357fa7eee055fe9a4fdaa6a1a562.tar.gz | |
Removed ?fresh=nonsense (bug 936405)
Change-Id: I69f7411967ef23348854c206efc79a3cf7d3755d
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/test_http.py | 3 | ||||
| -rw-r--r-- | tests/v2_0/test_ec2.py | 6 | ||||
| -rw-r--r-- | tests/v2_0/test_endpoints.py | 2 | ||||
| -rw-r--r-- | tests/v2_0/test_roles.py | 8 | ||||
| -rw-r--r-- | tests/v2_0/test_services.py | 4 | ||||
| -rw-r--r-- | tests/v2_0/test_tenants.py | 10 | ||||
| -rw-r--r-- | tests/v2_0/test_users.py | 10 |
7 files changed, 21 insertions, 22 deletions
diff --git a/tests/test_http.py b/tests/test_http.py index 4da7b55..e19dc23 100644 --- a/tests/test_http.py +++ b/tests/test_http.py @@ -35,8 +35,7 @@ class ClientTest(utils.TestCase): headers = {"X-Auth-Token": "token", "User-Agent": cl.USER_AGENT, } - mock_request.assert_called_with("http://127.0.0.1:5000/" - "hi?fresh=1234", + mock_request.assert_called_with("http://127.0.0.1:5000/hi", "GET", headers=headers) # Automatic JSON parsing self.assertEqual(body, {"hi": "there"}) diff --git a/tests/v2_0/test_ec2.py b/tests/v2_0/test_ec2.py index a9c7fb5..f78a81d 100644 --- a/tests/v2_0/test_ec2.py +++ b/tests/v2_0/test_ec2.py @@ -60,8 +60,8 @@ class EC2Tests(utils.TestCase): }) url = urlparse.urljoin(self.TEST_URL, - 'v2.0/users/%s/credentials/OS-EC2/%s' - '?fresh=1234' % (user_id, 'access')) + 'v2.0/users/%s/credentials/OS-EC2/%s' % + (user_id, 'access')) httplib2.Http.request(url, 'GET', headers=self.TEST_REQUEST_HEADERS) \ @@ -97,7 +97,7 @@ class EC2Tests(utils.TestCase): }) url = urlparse.urljoin(self.TEST_URL, - 'v2.0/users/%s/credentials/OS-EC2?fresh=1234' % user_id) + 'v2.0/users/%s/credentials/OS-EC2' % user_id) httplib2.Http.request(url, 'GET', headers=self.TEST_REQUEST_HEADERS) \ diff --git a/tests/v2_0/test_endpoints.py b/tests/v2_0/test_endpoints.py index d810f03..4f8ab88 100644 --- a/tests/v2_0/test_endpoints.py +++ b/tests/v2_0/test_endpoints.py @@ -106,7 +106,7 @@ class EndpointTests(utils.TestCase): }) httplib2.Http.request(urlparse.urljoin(self.TEST_URL, - 'v2.0/endpoints?fresh=1234'), + 'v2.0/endpoints'), 'GET', headers=self.TEST_REQUEST_HEADERS) \ .AndReturn((resp, resp['body'])) diff --git a/tests/v2_0/test_roles.py b/tests/v2_0/test_roles.py index 3f94191..46ccba1 100644 --- a/tests/v2_0/test_roles.py +++ b/tests/v2_0/test_roles.py @@ -72,7 +72,7 @@ class RoleTests(utils.TestCase): self.TEST_ROLES['roles']['values'][0]}), }) httplib2.Http.request(urlparse.urljoin(self.TEST_URL, - 'v2.0/OS-KSADM/roles/1?fresh=1234'), + 'v2.0/OS-KSADM/roles/1'), 'GET', headers=self.TEST_REQUEST_HEADERS) \ .AndReturn((resp, resp['body'])) @@ -90,7 +90,7 @@ class RoleTests(utils.TestCase): }) httplib2.Http.request(urlparse.urljoin(self.TEST_URL, - 'v2.0/OS-KSADM/roles?fresh=1234'), + 'v2.0/OS-KSADM/roles'), 'GET', headers=self.TEST_REQUEST_HEADERS) \ .AndReturn((resp, resp['body'])) @@ -106,7 +106,7 @@ class RoleTests(utils.TestCase): }) httplib2.Http.request(urlparse.urljoin(self.TEST_URL, - 'v2.0/users/foo/roles?fresh=1234'), + 'v2.0/users/foo/roles'), 'GET', headers=self.TEST_REQUEST_HEADERS) \ .AndReturn((resp, resp['body'])) @@ -122,7 +122,7 @@ class RoleTests(utils.TestCase): }) httplib2.Http.request(urlparse.urljoin(self.TEST_URL, - 'v2.0/tenants/barrr/users/foo/roles?fresh=1234'), + 'v2.0/tenants/barrr/users/foo/roles'), 'GET', headers=self.TEST_REQUEST_HEADERS) \ .AndReturn((resp, resp['body'])) diff --git a/tests/v2_0/test_services.py b/tests/v2_0/test_services.py index 1d3118e..f9f443b 100644 --- a/tests/v2_0/test_services.py +++ b/tests/v2_0/test_services.py @@ -84,7 +84,7 @@ class ServiceTests(utils.TestCase): self.TEST_SERVICES['OS-KSADM:services']['values'][0]}), }) httplib2.Http.request(urlparse.urljoin(self.TEST_URL, - 'v2.0/OS-KSADM/services/1?fresh=1234'), + 'v2.0/OS-KSADM/services/1'), 'GET', headers=self.TEST_REQUEST_HEADERS) \ .AndReturn((resp, resp['body'])) @@ -103,7 +103,7 @@ class ServiceTests(utils.TestCase): }) httplib2.Http.request(urlparse.urljoin(self.TEST_URL, - 'v2.0/OS-KSADM/services?fresh=1234'), + 'v2.0/OS-KSADM/services'), 'GET', headers=self.TEST_REQUEST_HEADERS) \ .AndReturn((resp, resp['body'])) diff --git a/tests/v2_0/test_tenants.py b/tests/v2_0/test_tenants.py index 44dd9f1..ee0c3df 100644 --- a/tests/v2_0/test_tenants.py +++ b/tests/v2_0/test_tenants.py @@ -89,7 +89,7 @@ class TenantTests(utils.TestCase): self.TEST_TENANTS['tenants']['values'][2]}), }) httplib2.Http.request(urlparse.urljoin(self.TEST_URL, - 'v2.0/tenants/1?fresh=1234'), + 'v2.0/tenants/1'), 'GET', headers=self.TEST_REQUEST_HEADERS) \ .AndReturn((resp, resp['body'])) @@ -107,7 +107,7 @@ class TenantTests(utils.TestCase): }) httplib2.Http.request(urlparse.urljoin(self.TEST_URL, - 'v2.0/tenants?fresh=1234'), + 'v2.0/tenants'), 'GET', headers=self.TEST_REQUEST_HEADERS) \ .AndReturn((resp, resp['body'])) @@ -123,7 +123,7 @@ class TenantTests(utils.TestCase): }) httplib2.Http.request(urlparse.urljoin(self.TEST_URL, - 'v2.0/tenants?limit=1&fresh=1234'), + 'v2.0/tenants?limit=1'), 'GET', headers=self.TEST_REQUEST_HEADERS) \ .AndReturn((resp, resp['body'])) @@ -139,7 +139,7 @@ class TenantTests(utils.TestCase): }) httplib2.Http.request(urlparse.urljoin(self.TEST_URL, - 'v2.0/tenants?marker=1&fresh=1234'), + 'v2.0/tenants?marker=1'), 'GET', headers=self.TEST_REQUEST_HEADERS) \ .AndReturn((resp, resp['body'])) @@ -155,7 +155,7 @@ class TenantTests(utils.TestCase): }) httplib2.Http.request(urlparse.urljoin(self.TEST_URL, - 'v2.0/tenants?marker=1&limit=1&fresh=1234'), + 'v2.0/tenants?marker=1&limit=1'), 'GET', headers=self.TEST_REQUEST_HEADERS) \ .AndReturn((resp, resp['body'])) diff --git a/tests/v2_0/test_users.py b/tests/v2_0/test_users.py index 77aabe3..48f0f45 100644 --- a/tests/v2_0/test_users.py +++ b/tests/v2_0/test_users.py @@ -87,7 +87,7 @@ class UserTests(utils.TestCase): "body": json.dumps({'user': self.TEST_USERS['users']['values'][0]}) }) httplib2.Http.request(urlparse.urljoin(self.TEST_URL, - 'v2.0/users/1?fresh=1234'), + 'v2.0/users/1'), 'GET', headers=self.TEST_REQUEST_HEADERS) \ .AndReturn((resp, resp['body'])) @@ -105,7 +105,7 @@ class UserTests(utils.TestCase): }) httplib2.Http.request(urlparse.urljoin(self.TEST_URL, - 'v2.0/users?fresh=1234'), + 'v2.0/users'), 'GET', headers=self.TEST_REQUEST_HEADERS) \ .AndReturn((resp, resp['body'])) @@ -121,7 +121,7 @@ class UserTests(utils.TestCase): }) httplib2.Http.request(urlparse.urljoin(self.TEST_URL, - 'v2.0/users?limit=1&fresh=1234'), + 'v2.0/users?limit=1'), 'GET', headers=self.TEST_REQUEST_HEADERS) \ .AndReturn((resp, resp['body'])) @@ -137,7 +137,7 @@ class UserTests(utils.TestCase): }) httplib2.Http.request(urlparse.urljoin(self.TEST_URL, - 'v2.0/users?marker=1&fresh=1234'), + 'v2.0/users?marker=1'), 'GET', headers=self.TEST_REQUEST_HEADERS) \ .AndReturn((resp, resp['body'])) @@ -153,7 +153,7 @@ class UserTests(utils.TestCase): }) httplib2.Http.request(urlparse.urljoin(self.TEST_URL, - 'v2.0/users?marker=1&limit=1&fresh=1234'), + 'v2.0/users?marker=1&limit=1'), 'GET', headers=self.TEST_REQUEST_HEADERS) \ .AndReturn((resp, resp['body'])) |
