From 20ecd99441ba8fc3d58b05d55c08eb17dd43b024 Mon Sep 17 00:00:00 2001 From: root Date: Mon, 2 May 2011 13:26:46 +0530 Subject: Added latest changes to sirish branch with pagination for get tenants --- test/test_setup.sql | 2 +- test/unit/test_identity.py | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) (limited to 'test') diff --git a/test/test_setup.sql b/test/test_setup.sql index a15f6d8e..a26a8947 100644 --- a/test/test_setup.sql +++ b/test/test_setup.sql @@ -24,7 +24,7 @@ insert into tenants (id, "desc", enabled) values -- Groups insert into groups (id, "desc", tenant_id) values - ("Admin", "Andmin users", "1234"); + ("Admin", "Admin users", "1234"); insert into groups (id, "desc", tenant_id) values ("Default", "Standard users", "1234"); diff --git a/test/unit/test_identity.py b/test/unit/test_identity.py index 24a31104..f8dca4a1 100644 --- a/test/unit/test_identity.py +++ b/test/unit/test_identity.py @@ -1,7 +1,8 @@ import os import sys # Need to access identity module -sys.path.append(os.path.abspath(os.path.join(os.path.abspath( __file__ ), '..', '..', '..', '..', 'keystone'))) +sys.path.append(os.path.abspath(os.path.join(os.path.abspath(__file__), + '..', '..', '..', '..', 'keystone'))) from keystone import identity import unittest from webtest import TestApp @@ -970,6 +971,5 @@ class delete_tenant_test(tenant_test): self.assertEqual(204, int(resp['status'])) - if __name__ == '__main__': unittest.main() -- cgit