diff options
| author | Justin Santa Barbara <justin@fathomdb.com> | 2011-03-15 23:22:17 -0700 |
|---|---|---|
| committer | Justin Santa Barbara <justin@fathomdb.com> | 2011-03-15 23:22:17 -0700 |
| commit | 20031162372329b40ca90b1bc39cebb4f187cace (patch) | |
| tree | 8ccee822613581c5cddb1396a29e79152a193583 | |
| parent | 166c58ed33c2858a47e145878a288136c93f65ee (diff) | |
| download | nova-20031162372329b40ca90b1bc39cebb4f187cace.tar.gz nova-20031162372329b40ca90b1bc39cebb4f187cace.tar.xz nova-20031162372329b40ca90b1bc39cebb4f187cace.zip | |
Use integer ids for (fake) users
| -rw-r--r-- | nova/tests/api/openstack/fakes.py | 3 | ||||
| -rw-r--r-- | nova/tests/api/openstack/test_accounts.py | 4 | ||||
| -rw-r--r-- | nova/tests/api/openstack/test_users.py | 4 |
3 files changed, 5 insertions, 6 deletions
diff --git a/nova/tests/api/openstack/fakes.py b/nova/tests/api/openstack/fakes.py index 52ac80e3f..c2ae48ce4 100644 --- a/nova/tests/api/openstack/fakes.py +++ b/nova/tests/api/openstack/fakes.py @@ -240,8 +240,7 @@ class FakeAuthManager(object): @classmethod def reset_fake_data(cls): - cls.auth_data = dict(acc1=User('guy1', 'guy1', 'acc1', - 'fortytwo!', False)) + cls.auth_data = dict(acc1=User(1, 'guy1', 'acc1', 'fortytwo!', False)) cls.projects = dict(testacct=Project('testacct', 'testacct', 'guy1', diff --git a/nova/tests/api/openstack/test_accounts.py b/nova/tests/api/openstack/test_accounts.py index 1bf49b33b..5cb08ffd2 100644 --- a/nova/tests/api/openstack/test_accounts.py +++ b/nova/tests/api/openstack/test_accounts.py @@ -57,8 +57,8 @@ class AccountsTest(test.TestCase): self.allow_admin = FLAGS.allow_admin_api FLAGS.allow_admin_api = True fakemgr = fakes.FakeAuthManager() - joeuser = User('guy1', 'guy1', 'acc1', 'fortytwo!', False) - superuser = User('guy2', 'guy2', 'acc2', 'swordfish', True) + joeuser = User(1, 'guy1', 'acc1', 'fortytwo!', False) + superuser = User(2, 'guy2', 'acc2', 'swordfish', True) fakemgr.add_user(joeuser) fakemgr.add_user(superuser) fakemgr.create_project('test1', joeuser) diff --git a/nova/tests/api/openstack/test_users.py b/nova/tests/api/openstack/test_users.py index a62db7efc..652aac936 100644 --- a/nova/tests/api/openstack/test_users.py +++ b/nova/tests/api/openstack/test_users.py @@ -61,8 +61,8 @@ class UsersTest(test.TestCase): self.allow_admin = FLAGS.allow_admin_api FLAGS.allow_admin_api = True fakemgr = fakes.FakeAuthManager() - fakemgr.add_user(User('guy1', 'guy1', 'acc1', 'fortytwo!', False)) - fakemgr.add_user(User('guy2', 'guy2', 'acc2', 'swordfish', True)) + fakemgr.add_user(User(1, 'guy1', 'acc1', 'fortytwo!', False)) + fakemgr.add_user(User(2, 'guy2', 'acc2', 'swordfish', True)) def tearDown(self): self.stubs.UnsetAll() |