Merge "assertEquals order wrong"

This commit is contained in:
Jenkins 2014-09-07 05:14:07 +00:00 committed by Gerrit Code Review
commit d3502b62d6

View File

@ -101,7 +101,7 @@ class TestVolumeCreate(TestVolume):
'status', 'status',
'type', 'type',
) )
self.assertEqual(columns, collist) self.assertEqual(collist, columns)
datalist = ( datalist = (
'detached', 'detached',
volume_fakes.volume_zone, volume_fakes.volume_zone,
@ -113,7 +113,7 @@ class TestVolumeCreate(TestVolume):
'', '',
volume_fakes.volume_type, volume_fakes.volume_type,
) )
self.assertEqual(data, datalist) self.assertEqual(datalist, data)
def test_volume_create_options(self): def test_volume_create_options(self):
arglist = [ arglist = [
@ -165,7 +165,7 @@ class TestVolumeCreate(TestVolume):
'status', 'status',
'type', 'type',
) )
self.assertEqual(columns, collist) self.assertEqual(collist, columns)
datalist = ( datalist = (
'detached', 'detached',
volume_fakes.volume_zone, volume_fakes.volume_zone,
@ -177,7 +177,7 @@ class TestVolumeCreate(TestVolume):
'', '',
volume_fakes.volume_type, volume_fakes.volume_type,
) )
self.assertEqual(data, datalist) self.assertEqual(datalist, data)
def test_volume_create_user_project_id(self): def test_volume_create_user_project_id(self):
# Return a project # Return a project
@ -240,7 +240,7 @@ class TestVolumeCreate(TestVolume):
'status', 'status',
'type', 'type',
) )
self.assertEqual(columns, collist) self.assertEqual(collist, columns)
datalist = ( datalist = (
'detached', 'detached',
volume_fakes.volume_zone, volume_fakes.volume_zone,
@ -252,7 +252,7 @@ class TestVolumeCreate(TestVolume):
'', '',
volume_fakes.volume_type, volume_fakes.volume_type,
) )
self.assertEqual(data, datalist) self.assertEqual(datalist, data)
def test_volume_create_user_project_name(self): def test_volume_create_user_project_name(self):
# Return a project # Return a project
@ -315,7 +315,7 @@ class TestVolumeCreate(TestVolume):
'status', 'status',
'type', 'type',
) )
self.assertEqual(columns, collist) self.assertEqual(collist, columns)
datalist = ( datalist = (
'detached', 'detached',
volume_fakes.volume_zone, volume_fakes.volume_zone,
@ -327,7 +327,7 @@ class TestVolumeCreate(TestVolume):
'', '',
volume_fakes.volume_type, volume_fakes.volume_type,
) )
self.assertEqual(data, datalist) self.assertEqual(datalist, data)
def test_volume_create_properties(self): def test_volume_create_properties(self):
arglist = [ arglist = [
@ -376,7 +376,7 @@ class TestVolumeCreate(TestVolume):
'status', 'status',
'type', 'type',
) )
self.assertEqual(columns, collist) self.assertEqual(collist, columns)
datalist = ( datalist = (
'detached', 'detached',
volume_fakes.volume_zone, volume_fakes.volume_zone,
@ -388,4 +388,4 @@ class TestVolumeCreate(TestVolume):
'', '',
volume_fakes.volume_type, volume_fakes.volume_type,
) )
self.assertEqual(data, datalist) self.assertEqual(datalist, data)