diff options
| author | Jenkins <jenkins@review.openstack.org> | 2014-04-23 23:11:48 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2014-04-23 23:11:48 +0000 |
| commit | 845f6705bf65725830b1a7bba22870f177668d86 (patch) | |
| tree | 88621faceaca26aa8f9d0047a9789d484375ae88 /openstackclient/tests | |
| parent | 8ec78a10f8ee35b607c4a7c0260de31178cdf5b0 (diff) | |
| parent | e72072adc3b62b5ef8e3076169fed19dea9995f7 (diff) | |
| download | python-openstackclient-845f6705bf65725830b1a7bba22870f177668d86.tar.gz | |
Merge "Fix the project option to user list so it filters"
Diffstat (limited to 'openstackclient/tests')
| -rw-r--r-- | openstackclient/tests/identity/v2_0/test_user.py | 12 |
1 files changed, 9 insertions, 3 deletions
diff --git a/openstackclient/tests/identity/v2_0/test_user.py b/openstackclient/tests/identity/v2_0/test_user.py index dfb358ff..e191431c 100644 --- a/openstackclient/tests/identity/v2_0/test_user.py +++ b/openstackclient/tests/identity/v2_0/test_user.py @@ -381,6 +381,11 @@ class TestUserList(TestUser): def setUp(self): super(TestUserList, self).setUp() + self.projects_mock.get.return_value = fakes.FakeResource( + None, + copy.deepcopy(identity_fakes.PROJECT_2), + loaded=True, + ) self.projects_mock.list.return_value = [ fakes.FakeResource( None, @@ -408,7 +413,7 @@ class TestUserList(TestUser): # DisplayCommandBase.take_action() returns two tuples columns, data = self.cmd.take_action(parsed_args) - self.users_mock.list.assert_called_with() + self.users_mock.list.assert_called_with(tenant_id=None) collist = ('ID', 'Name') self.assertEqual(columns, collist) @@ -426,11 +431,12 @@ class TestUserList(TestUser): ('project', identity_fakes.project_id), ] parsed_args = self.check_parser(self.cmd, arglist, verifylist) + project_id = identity_fakes.PROJECT_2['id'] # DisplayCommandBase.take_action() returns two tuples columns, data = self.cmd.take_action(parsed_args) - self.users_mock.list.assert_called_with() + self.users_mock.list.assert_called_with(tenant_id=project_id) collist = ('ID', 'Name') self.assertEqual(columns, collist) @@ -452,7 +458,7 @@ class TestUserList(TestUser): # DisplayCommandBase.take_action() returns two tuples columns, data = self.cmd.take_action(parsed_args) - self.users_mock.list.assert_called_with() + self.users_mock.list.assert_called_with(tenant_id=None) collist = ('ID', 'Name', 'Project', 'Email', 'Enabled') self.assertEqual(columns, collist) |