summaryrefslogtreecommitdiff
path: root/openstackclient/tests/object
diff options
context:
space:
mode:
Diffstat (limited to 'openstackclient/tests/object')
-rw-r--r--openstackclient/tests/object/v1/test_container.py18
-rw-r--r--openstackclient/tests/object/v1/test_container_all.py20
-rw-r--r--openstackclient/tests/object/v1/test_object.py53
-rw-r--r--openstackclient/tests/object/v1/test_object_all.py8
4 files changed, 43 insertions, 56 deletions
diff --git a/openstackclient/tests/object/v1/test_container.py b/openstackclient/tests/object/v1/test_container.py
index 2ef2f7b5..afcb3386 100644
--- a/openstackclient/tests/object/v1/test_container.py
+++ b/openstackclient/tests/object/v1/test_container.py
@@ -32,6 +32,9 @@ class FakeClient(object):
class TestContainer(object_fakes.TestObjectv1):
+
+ columns = ('Name',)
+
def setUp(self):
super(TestContainer, self).setUp()
self.app.client_manager.object_store = object_store.APIv1(
@@ -73,8 +76,7 @@ class TestContainerList(TestContainer):
**kwargs
)
- collist = ('Name',)
- self.assertEqual(collist, columns)
+ self.assertEqual(self.columns, columns)
datalist = (
(object_fakes.container_name, ),
(object_fakes.container_name_3, ),
@@ -107,8 +109,7 @@ class TestContainerList(TestContainer):
**kwargs
)
- collist = ('Name',)
- self.assertEqual(collist, columns)
+ self.assertEqual(self.columns, columns)
datalist = (
(object_fakes.container_name, ),
(object_fakes.container_name_3, ),
@@ -143,8 +144,7 @@ class TestContainerList(TestContainer):
**kwargs
)
- collist = ('Name',)
- self.assertEqual(collist, columns)
+ self.assertEqual(self.columns, columns)
datalist = (
(object_fakes.container_name, ),
(object_fakes.container_name_3, ),
@@ -176,8 +176,7 @@ class TestContainerList(TestContainer):
**kwargs
)
- collist = ('Name',)
- self.assertEqual(collist, columns)
+ self.assertEqual(self.columns, columns)
datalist = (
(object_fakes.container_name, ),
(object_fakes.container_name_3, ),
@@ -250,8 +249,7 @@ class TestContainerList(TestContainer):
**kwargs
)
- collist = ('Name',)
- self.assertEqual(collist, columns)
+ self.assertEqual(self.columns, columns)
datalist = (
(object_fakes.container_name, ),
(object_fakes.container_name_2, ),
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, ),
diff --git a/openstackclient/tests/object/v1/test_object.py b/openstackclient/tests/object/v1/test_object.py
index 305fe8f8..f0d62f6e 100644
--- a/openstackclient/tests/object/v1/test_object.py
+++ b/openstackclient/tests/object/v1/test_object.py
@@ -40,6 +40,13 @@ class TestObject(object_fakes.TestObjectv1):
)
class TestObjectList(TestObject):
+ columns = ('Name',)
+ datalist = (
+ (
+ object_fakes.object_name_2,
+ ),
+ )
+
def setUp(self):
super(TestObjectList, self).setUp()
@@ -67,8 +74,7 @@ class TestObjectList(TestObject):
container=object_fakes.container_name,
)
- collist = ('Name',)
- self.assertEqual(collist, columns)
+ self.assertEqual(self.columns, columns)
datalist = (
(object_fakes.object_name_1, ),
(object_fakes.object_name_2, ),
@@ -102,12 +108,8 @@ class TestObjectList(TestObject):
**kwargs
)
- collist = ('Name',)
- self.assertEqual(collist, columns)
- datalist = (
- (object_fakes.object_name_2, ),
- )
- self.assertEqual(datalist, tuple(data))
+ self.assertEqual(self.columns, columns)
+ self.assertEqual(self.datalist, tuple(data))
def test_object_list_objects_delimiter(self, o_mock):
o_mock.return_value = [
@@ -136,12 +138,8 @@ class TestObjectList(TestObject):
**kwargs
)
- collist = ('Name',)
- self.assertEqual(collist, columns)
- datalist = (
- (object_fakes.object_name_2, ),
- )
- self.assertEqual(datalist, tuple(data))
+ self.assertEqual(self.columns, columns)
+ self.assertEqual(self.datalist, tuple(data))
def test_object_list_objects_marker(self, o_mock):
o_mock.return_value = [
@@ -170,12 +168,8 @@ class TestObjectList(TestObject):
**kwargs
)
- collist = ('Name',)
- self.assertEqual(collist, columns)
- datalist = (
- (object_fakes.object_name_2, ),
- )
- self.assertEqual(datalist, tuple(data))
+ self.assertEqual(self.columns, columns)
+ self.assertEqual(self.datalist, tuple(data))
def test_object_list_objects_end_marker(self, o_mock):
o_mock.return_value = [
@@ -204,12 +198,8 @@ class TestObjectList(TestObject):
**kwargs
)
- collist = ('Name',)
- self.assertEqual(collist, columns)
- datalist = (
- (object_fakes.object_name_2, ),
- )
- self.assertEqual(datalist, tuple(data))
+ self.assertEqual(self.columns, columns)
+ self.assertEqual(self.datalist, tuple(data))
def test_object_list_objects_limit(self, o_mock):
o_mock.return_value = [
@@ -238,12 +228,8 @@ class TestObjectList(TestObject):
**kwargs
)
- collist = ('Name',)
- self.assertEqual(collist, columns)
- datalist = (
- (object_fakes.object_name_2, ),
- )
- self.assertEqual(datalist, tuple(data))
+ self.assertEqual(self.columns, columns)
+ self.assertEqual(self.datalist, tuple(data))
def test_object_list_objects_long(self, o_mock):
o_mock.return_value = [
@@ -320,8 +306,7 @@ class TestObjectList(TestObject):
**kwargs
)
- collist = ('Name',)
- self.assertEqual(collist, columns)
+ self.assertEqual(self.columns, columns)
datalist = (
(object_fakes.object_name_1, ),
(object_fakes.object_name_2, ),
diff --git a/openstackclient/tests/object/v1/test_object_all.py b/openstackclient/tests/object/v1/test_object_all.py
index 7a76ab76..a90e5b65 100644
--- a/openstackclient/tests/object/v1/test_object_all.py
+++ b/openstackclient/tests/object/v1/test_object_all.py
@@ -37,6 +37,8 @@ class TestObjectCreate(TestObjectAll):
class TestObjectList(TestObjectAll):
+ columns = ('Name',)
+
def setUp(self):
super(TestObjectList, self).setUp()
@@ -69,8 +71,7 @@ class TestObjectList(TestObjectAll):
# 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.object_name_1, ),
(object_fakes.object_name_2, ),
@@ -104,8 +105,7 @@ class TestObjectList(TestObjectAll):
# DisplayCommandBase.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.object_name_2, ),
)
View Lorry Controller Status