openstack/python-openstackclient
Code Issues Proposed changes

Merge "Swap remaining assertEqual arguments"

Browse Source
This commit is contained in:
Jenkins 2014-11-10 19:01:52 +00:00 committed by Gerrit Code Review
commit c8ddfd8311
1 changed files with 22 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

44
openstackclient/tests/identity/v2_0/test_user.py
View File

@ -84,7 +84,7 @@ class TestUserCreate(TestUser):
) )
collist = ('email', 'enabled', 'id', 'name', 'project_id') collist = ('email', 'enabled', 'id', 'name', 'project_id')
self.assertEqual(columns, collist) self.assertEqual(collist, columns)
datalist = ( datalist = (
identity_fakes.user_email, identity_fakes.user_email,
True, True,
@ -92,7 +92,7 @@ class TestUserCreate(TestUser):
identity_fakes.user_name, identity_fakes.user_name,
identity_fakes.project_id, identity_fakes.project_id,
) )
self.assertEqual(data, datalist) self.assertEqual(datalist, data)
def test_user_create_password(self): def test_user_create_password(self):
arglist = [ arglist = [
@ -123,7 +123,7 @@ class TestUserCreate(TestUser):
) )
collist = ('email', 'enabled', 'id', 'name', 'project_id') collist = ('email', 'enabled', 'id', 'name', 'project_id')
self.assertEqual(columns, collist) self.assertEqual(collist, columns)
datalist = ( datalist = (
identity_fakes.user_email, identity_fakes.user_email,
True, True,
@ -131,7 +131,7 @@ class TestUserCreate(TestUser):
identity_fakes.user_name, identity_fakes.user_name,
identity_fakes.project_id, identity_fakes.project_id,
) )
self.assertEqual(data, datalist) self.assertEqual(datalist, data)
def test_user_create_password_prompt(self): def test_user_create_password_prompt(self):
arglist = [ arglist = [
@ -164,7 +164,7 @@ class TestUserCreate(TestUser):
) )
collist = ('email', 'enabled', 'id', 'name', 'project_id') collist = ('email', 'enabled', 'id', 'name', 'project_id')
self.assertEqual(columns, collist) self.assertEqual(collist, columns)
datalist = ( datalist = (
identity_fakes.user_email, identity_fakes.user_email,
True, True,
@ -172,7 +172,7 @@ class TestUserCreate(TestUser):
identity_fakes.user_name, identity_fakes.user_name,
identity_fakes.project_id, identity_fakes.project_id,
) )
self.assertEqual(data, datalist) self.assertEqual(datalist, data)
def test_user_create_email(self): def test_user_create_email(self):
arglist = [ arglist = [
@ -202,7 +202,7 @@ class TestUserCreate(TestUser):
) )
collist = ('email', 'enabled', 'id', 'name', 'project_id') collist = ('email', 'enabled', 'id', 'name', 'project_id')
self.assertEqual(columns, collist) self.assertEqual(collist, columns)
datalist = ( datalist = (
identity_fakes.user_email, identity_fakes.user_email,
True, True,
@ -210,7 +210,7 @@ class TestUserCreate(TestUser):
identity_fakes.user_name, identity_fakes.user_name,
identity_fakes.project_id, identity_fakes.project_id,
) )
self.assertEqual(data, datalist) self.assertEqual(datalist, data)
def test_user_create_project(self): def test_user_create_project(self):
# Return the new project # Return the new project
@ -255,7 +255,7 @@ class TestUserCreate(TestUser):
) )
collist = ('email', 'enabled', 'id', 'name', 'project_id') collist = ('email', 'enabled', 'id', 'name', 'project_id')
self.assertEqual(columns, collist) self.assertEqual(collist, columns)
datalist = ( datalist = (
identity_fakes.user_email, identity_fakes.user_email,
True, True,
@ -263,7 +263,7 @@ class TestUserCreate(TestUser):
identity_fakes.user_name, identity_fakes.user_name,
identity_fakes.PROJECT_2['id'], identity_fakes.PROJECT_2['id'],
) )
self.assertEqual(data, datalist) self.assertEqual(datalist, data)
def test_user_create_enable(self): def test_user_create_enable(self):
arglist = [ arglist = [
@ -294,7 +294,7 @@ class TestUserCreate(TestUser):
) )
collist = ('email', 'enabled', 'id', 'name', 'project_id') collist = ('email', 'enabled', 'id', 'name', 'project_id')
self.assertEqual(columns, collist) self.assertEqual(collist, columns)
datalist = ( datalist = (
identity_fakes.user_email, identity_fakes.user_email,
True, True,
@ -302,7 +302,7 @@ class TestUserCreate(TestUser):
identity_fakes.user_name, identity_fakes.user_name,
identity_fakes.project_id, identity_fakes.project_id,
) )
self.assertEqual(data, datalist) self.assertEqual(datalist, data)
def test_user_create_disable(self): def test_user_create_disable(self):
arglist = [ arglist = [
@ -333,7 +333,7 @@ class TestUserCreate(TestUser):
) )
collist = ('email', 'enabled', 'id', 'name', 'project_id') collist = ('email', 'enabled', 'id', 'name', 'project_id')
self.assertEqual(columns, collist) self.assertEqual(collist, columns)
datalist = ( datalist = (
identity_fakes.user_email, identity_fakes.user_email,
True, True,
@ -341,7 +341,7 @@ class TestUserCreate(TestUser):
identity_fakes.user_name, identity_fakes.user_name,
identity_fakes.project_id, identity_fakes.project_id,
) )
self.assertEqual(data, datalist) self.assertEqual(datalist, data)
def test_user_create_or_show_exists(self): def test_user_create_or_show_exists(self):
def _raise_conflict(*args, **kwargs): def _raise_conflict(*args, **kwargs):
@ -495,12 +495,12 @@ class TestUserList(TestUser):
self.users_mock.list.assert_called_with(tenant_id=None) self.users_mock.list.assert_called_with(tenant_id=None)
collist = ('ID', 'Name') collist = ('ID', 'Name')
self.assertEqual(columns, collist) self.assertEqual(collist, columns)
datalist = (( datalist = ((
identity_fakes.user_id, identity_fakes.user_id,
identity_fakes.user_name, identity_fakes.user_name,
), ) ), )
self.assertEqual(tuple(data), datalist) self.assertEqual(datalist, tuple(data))
def test_user_list_project(self): def test_user_list_project(self):
arglist = [ arglist = [
@ -518,12 +518,12 @@ class TestUserList(TestUser):
self.users_mock.list.assert_called_with(tenant_id=project_id) self.users_mock.list.assert_called_with(tenant_id=project_id)
collist = ('ID', 'Name') collist = ('ID', 'Name')
self.assertEqual(columns, collist) self.assertEqual(collist, columns)
datalist = (( datalist = ((
identity_fakes.user_id, identity_fakes.user_id,
identity_fakes.user_name, identity_fakes.user_name,
), ) ), )
self.assertEqual(tuple(data), datalist) self.assertEqual(datalist, tuple(data))
def test_user_list_long(self): def test_user_list_long(self):
arglist = [ arglist = [
@ -540,7 +540,7 @@ class TestUserList(TestUser):
self.users_mock.list.assert_called_with(tenant_id=None) self.users_mock.list.assert_called_with(tenant_id=None)
collist = ('ID', 'Name', 'Project', 'Email', 'Enabled') collist = ('ID', 'Name', 'Project', 'Email', 'Enabled')
self.assertEqual(columns, collist) self.assertEqual(collist, columns)
datalist = (( datalist = ((
identity_fakes.user_id, identity_fakes.user_id,
identity_fakes.user_name, identity_fakes.user_name,
@ -548,7 +548,7 @@ class TestUserList(TestUser):
identity_fakes.user_email, identity_fakes.user_email,
True, True,
), ) ), )
self.assertEqual(tuple(data), datalist) self.assertEqual(datalist, tuple(data))
class TestUserSet(TestUser): class TestUserSet(TestUser):
@ -816,7 +816,7 @@ class TestUserShow(TestUser):
self.users_mock.get.assert_called_with(identity_fakes.user_id) self.users_mock.get.assert_called_with(identity_fakes.user_id)
collist = ('email', 'enabled', 'id', 'name', 'project_id') collist = ('email', 'enabled', 'id', 'name', 'project_id')
self.assertEqual(columns, collist) self.assertEqual(collist, columns)
datalist = ( datalist = (
identity_fakes.user_email, identity_fakes.user_email,
True, True,
@ -824,4 +824,4 @@ class TestUserShow(TestUser):
identity_fakes.user_name, identity_fakes.user_name,
identity_fakes.project_id, identity_fakes.project_id,
) )
self.assertEqual(data, datalist) self.assertEqual(datalist, data)