diff options
| author | Jenkins <jenkins@review.openstack.org> | 2016-01-23 08:24:41 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2016-01-23 08:24:41 +0000 |
| commit | 7b2ff8eef241783e6df3fc3d948c68e88201356e (patch) | |
| tree | a6dae1ba6a2559c12e0297697b16783899b3fb1f /openstackclient/tests/object/v1/test_container_all.py | |
| parent | ee78fb2f782d3508cfa59df998d83f34963174ae (diff) | |
| parent | 69b8cde5f12c1d11036d99ef69421f103ebed87d (diff) | |
| download | python-openstackclient-7b2ff8eef241783e6df3fc3d948c68e88201356e.tar.gz | |
Merge "Refactor abstract columns and datalist out in image and object test cases"
Diffstat (limited to 'openstackclient/tests/object/v1/test_container_all.py')
| -rw-r--r-- | openstackclient/tests/object/v1/test_container_all.py | 20 |
1 files changed, 12 insertions, 8 deletions
diff --git a/openstackclient/tests/object/v1/test_container_all.py b/openstackclient/tests/object/v1/test_container_all.py index 69fc0f39..c2dd02a5 100644 --- a/openstackclient/tests/object/v1/test_container_all.py +++ b/openstackclient/tests/object/v1/test_container_all.py @@ -29,6 +29,12 @@ class TestContainerAll(object_fakes.TestObjectv1): class TestContainerCreate(TestContainerAll): + columns = ( + 'account', + 'container', + 'x-trans-id', + ) + def setUp(self): super(TestContainerCreate, self).setUp() @@ -54,8 +60,7 @@ class TestContainerCreate(TestContainerAll): # DisplayCommandBase.take_action() returns two tuples columns, data = self.cmd.take_action(parsed_args) - collist = ('account', 'container', 'x-trans-id') - self.assertEqual(collist, columns) + self.assertEqual(self.columns, columns) datalist = [( object_fakes.ACCOUNT_ID, 'ernie', @@ -89,8 +94,7 @@ class TestContainerCreate(TestContainerAll): # DisplayCommandBase.take_action() returns two tuples columns, data = self.cmd.take_action(parsed_args) - collist = ('account', 'container', 'x-trans-id') - self.assertEqual(collist, columns) + self.assertEqual(self.columns, columns) datalist = [ ( object_fakes.ACCOUNT_ID, @@ -161,6 +165,8 @@ class TestContainerDelete(TestContainerAll): class TestContainerList(TestContainerAll): + columns = ('Name',) + def setUp(self): super(TestContainerList, self).setUp() @@ -187,8 +193,7 @@ class TestContainerList(TestContainerAll): # Lister.take_action() returns two tuples columns, data = self.cmd.take_action(parsed_args) - collist = ('Name',) - self.assertEqual(collist, columns) + self.assertEqual(self.columns, columns) datalist = [ (object_fakes.container_name, ), (object_fakes.container_name_3, ), @@ -219,8 +224,7 @@ class TestContainerList(TestContainerAll): # Lister.take_action() returns two tuples columns, data = self.cmd.take_action(parsed_args) - collist = ('Name',) - self.assertEqual(collist, columns) + self.assertEqual(self.columns, columns) datalist = [ (object_fakes.container_name, ), (object_fakes.container_name_3, ), |