| commit | 8793403115004ce3eccfc56e58641bf39ccac38a | [log] [tgz] |
|---|---|---|
| author | Jenkins <jenkins@review.openstack.org> | Wed Jun 05 18:27:23 2013 +0000 |
| committer | Gerrit Code Review <review@openstack.org> | Wed Jun 05 18:27:23 2013 +0000 |
| tree | f73f322e3dfdfdf47de4bc9acd4efd63f85fbc13 | |
| parent | 9039b4d2ebf90f4633c6f73bf918a562ab488f6d [diff] | |
| parent | 0d66049d8542934717b885b9f46b7684036146f6 [diff] |
Merge "Fix a race condition in test_create_delete_image()"
diff --git a/tempest/api/compute/servers/test_list_servers_negative.py b/tempest/api/compute/servers/test_list_servers_negative.py index 0f35ee5..db9bdc1 100644 --- a/tempest/api/compute/servers/test_list_servers_negative.py +++ b/tempest/api/compute/servers/test_list_servers_negative.py
@@ -15,6 +15,7 @@ # License for the specific language governing permissions and limitations # under the License. +import datetime from tempest.api import compute from tempest.api.compute import base @@ -170,7 +171,8 @@ @attr(type='gate') def test_list_servers_by_changes_since(self): # Servers are listed by specifying changes-since date - changes_since = {'changes-since': '2011-01-01T12:34:00Z'} + since = datetime.datetime.utcnow() - datetime.timedelta(minutes=2) + changes_since = {'changes-since': since.isoformat()} resp, body = self.client.list_servers(changes_since) self.assertEqual('200', resp['status']) # changes-since returns all instances, including deleted.
diff --git a/tempest/services/identity/v3/json/endpoints_client.py b/tempest/services/identity/v3/json/endpoints_client.py old mode 100755 new mode 100644
diff --git a/tempest/services/identity/v3/xml/endpoints_client.py b/tempest/services/identity/v3/xml/endpoints_client.py old mode 100755 new mode 100644