summaryrefslogtreecommitdiff
path: root/openstackclient/tests/object/v1/test_container.py
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2014-11-13 22:11:43 +0000
committerGerrit Code Review <review@openstack.org>2014-11-13 22:11:43 +0000
commitc55fdb6f6d1fc356ee03cf21fdf3d5b99418c921 (patch)
treeda934d73f3b8f484c046db3b5c4eeda0aa8b0186 /openstackclient/tests/object/v1/test_container.py
parenta4ef8214381515376093b4d36b213e50e6e5dcf3 (diff)
parentc91d1ca66359fee1a1509f0ac6da4c32159bb59a (diff)
downloadpython-openstackclient-c55fdb6f6d1fc356ee03cf21fdf3d5b99418c921.tar.gz
Merge "Beef up object-store tests"
Diffstat (limited to 'openstackclient/tests/object/v1/test_container.py')
-rw-r--r--openstackclient/tests/object/v1/test_container.py28
1 files changed, 14 insertions, 14 deletions
diff --git a/openstackclient/tests/object/v1/test_container.py b/openstackclient/tests/object/v1/test_container.py
index 70b88fc4..2ef2f7b5 100644
--- a/openstackclient/tests/object/v1/test_container.py
+++ b/openstackclient/tests/object/v1/test_container.py
@@ -74,13 +74,13 @@ class TestContainerList(TestContainer):
)
collist = ('Name',)
- self.assertEqual(columns, collist)
+ self.assertEqual(collist, columns)
datalist = (
(object_fakes.container_name, ),
(object_fakes.container_name_3, ),
(object_fakes.container_name_2, ),
)
- self.assertEqual(tuple(data), datalist)
+ self.assertEqual(datalist, tuple(data))
def test_object_list_containers_prefix(self, c_mock):
c_mock.return_value = [
@@ -108,12 +108,12 @@ class TestContainerList(TestContainer):
)
collist = ('Name',)
- self.assertEqual(columns, collist)
+ self.assertEqual(collist, columns)
datalist = (
(object_fakes.container_name, ),
(object_fakes.container_name_3, ),
)
- self.assertEqual(tuple(data), datalist)
+ self.assertEqual(datalist, tuple(data))
def test_object_list_containers_marker(self, c_mock):
c_mock.return_value = [
@@ -144,12 +144,12 @@ class TestContainerList(TestContainer):
)
collist = ('Name',)
- self.assertEqual(columns, collist)
+ self.assertEqual(collist, columns)
datalist = (
(object_fakes.container_name, ),
(object_fakes.container_name_3, ),
)
- self.assertEqual(tuple(data), datalist)
+ self.assertEqual(datalist, tuple(data))
def test_object_list_containers_limit(self, c_mock):
c_mock.return_value = [
@@ -177,12 +177,12 @@ class TestContainerList(TestContainer):
)
collist = ('Name',)
- self.assertEqual(columns, collist)
+ self.assertEqual(collist, columns)
datalist = (
(object_fakes.container_name, ),
(object_fakes.container_name_3, ),
)
- self.assertEqual(tuple(data), datalist)
+ self.assertEqual(datalist, tuple(data))
def test_object_list_containers_long(self, c_mock):
c_mock.return_value = [
@@ -209,7 +209,7 @@ class TestContainerList(TestContainer):
)
collist = ('Name', 'Bytes', 'Count')
- self.assertEqual(columns, collist)
+ self.assertEqual(collist, columns)
datalist = (
(
object_fakes.container_name,
@@ -222,7 +222,7 @@ class TestContainerList(TestContainer):
object_fakes.container_count * 3,
),
)
- self.assertEqual(tuple(data), datalist)
+ self.assertEqual(datalist, tuple(data))
def test_object_list_containers_all(self, c_mock):
c_mock.return_value = [
@@ -251,13 +251,13 @@ class TestContainerList(TestContainer):
)
collist = ('Name',)
- self.assertEqual(columns, collist)
+ self.assertEqual(collist, columns)
datalist = (
(object_fakes.container_name, ),
(object_fakes.container_name_2, ),
(object_fakes.container_name_3, ),
)
- self.assertEqual(tuple(data), datalist)
+ self.assertEqual(datalist, tuple(data))
@mock.patch(
@@ -295,10 +295,10 @@ class TestContainerShow(TestContainer):
)
collist = ('bytes', 'count', 'name')
- self.assertEqual(columns, collist)
+ self.assertEqual(collist, columns)
datalist = (
object_fakes.container_bytes,
object_fakes.container_count,
object_fakes.container_name,
)
- self.assertEqual(data, datalist)
+ self.assertEqual(datalist, data)