summaryrefslogtreecommitdiff
path: root/functional/tests/object
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2016-07-06 15:31:42 +0000
committerGerrit Code Review <review@openstack.org>2016-07-06 15:31:42 +0000
commit272d19340117927f6988c61113abc3dd995af76d (patch)
tree758e594906c7fcd64feb6d1a748d6b2ef1d6a7e7 /functional/tests/object
parente0b63e64c13955ba4f119b5cbee787822602bc6e (diff)
parent259b4a14628b5eae5f9154a052381145e7e7ba1e (diff)
downloadpython-openstackclient-272d19340117927f6988c61113abc3dd995af76d.tar.gz
Merge "Deduplicate get_opts methods"
Diffstat (limited to 'functional/tests/object')
-rw-r--r--functional/tests/object/v1/test_container.py9
1 files changed, 4 insertions, 5 deletions
diff --git a/functional/tests/object/v1/test_container.py b/functional/tests/object/v1/test_container.py
index 8721a4a7..4f9e843b 100644
--- a/functional/tests/object/v1/test_container.py
+++ b/functional/tests/object/v1/test_container.py
@@ -21,10 +21,9 @@ class ContainerTests(test.TestCase):
@classmethod
def setUpClass(cls):
- opts = cls.get_list_opts(['container'])
+ opts = cls.get_opts(['container'])
raw_output = cls.openstack('container create ' + cls.NAME + opts)
- expected = '"container"\n"' + cls.NAME + '"\n'
- cls.assertOutput(expected, raw_output)
+ cls.assertOutput(cls.NAME + '\n', raw_output)
@classmethod
def tearDownClass(cls):
@@ -32,11 +31,11 @@ class ContainerTests(test.TestCase):
cls.assertOutput('', raw_output)
def test_container_list(self):
- opts = self.get_list_opts(['Name'])
+ opts = self.get_opts(['Name'])
raw_output = self.openstack('container list' + opts)
self.assertIn(self.NAME, raw_output)
def test_container_show(self):
- opts = self.get_show_opts(['container'])
+ opts = self.get_opts(['container'])
raw_output = self.openstack('container show ' + self.NAME + opts)
self.assertEqual(self.NAME + "\n", raw_output)