diff options
| author | Jenkins <jenkins@review.openstack.org> | 2015-10-08 20:38:05 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2015-10-08 20:38:05 +0000 |
| commit | 9f23f1f13fa1d36201a5441f9923219cb82be570 (patch) | |
| tree | 9cd70ae434f984186dcc8d1763ad4aadae96fe94 /functional | |
| parent | 72bf89cccc6c1a8ec520488f4f4b3e05b653e128 (diff) | |
| parent | 2bd82ab89258110b44135ae4cf2c4678938673d2 (diff) | |
| download | python-openstackclient-9f23f1f13fa1d36201a5441f9923219cb82be570.tar.gz | |
Merge "image set should not show the resource"
Diffstat (limited to 'functional')
| -rw-r--r-- | functional/tests/image/v1/test_image.py | 17 |
1 files changed, 8 insertions, 9 deletions
diff --git a/functional/tests/image/v1/test_image.py b/functional/tests/image/v1/test_image.py index 17c0c3dd..fe61f830 100644 --- a/functional/tests/image/v1/test_image.py +++ b/functional/tests/image/v1/test_image.py @@ -35,10 +35,9 @@ class ImageTests(test.TestCase): @classmethod def tearDownClass(cls): # Rename test - opts = cls.get_show_opts(cls.FIELDS) - raw_output = cls.openstack( - 'image set --name ' + cls.OTHER_NAME + ' ' + cls.NAME + opts) - cls.assertOutput(cls.OTHER_NAME + "\n", raw_output) + raw_output = cls.openstack('image set --name ' + cls.OTHER_NAME + ' ' + + cls.NAME) + cls.assertOutput('', raw_output) # Delete test raw_output = cls.openstack('image delete ' + cls.OTHER_NAME) cls.assertOutput('', raw_output) @@ -56,13 +55,13 @@ class ImageTests(test.TestCase): def test_image_set(self): opts = self.get_show_opts([ "disk_format", "is_public", "min_disk", "min_ram", "name"]) - raw_output = self.openstack('image set --min-disk 4 --min-ram 5 ' + - '--disk-format qcow2 --public ' + - self.NAME + opts) + self.openstack('image set --min-disk 4 --min-ram 5 ' + + '--disk-format qcow2 --public ' + self.NAME) + raw_output = self.openstack('image show ' + self.NAME + opts) self.assertEqual("qcow2\nTrue\n4\n5\n" + self.NAME + '\n', raw_output) def test_image_metadata(self): opts = self.get_show_opts(["name", "properties"]) - raw_output = self.openstack( - 'image set --property a=b --property c=d ' + self.NAME + opts) + self.openstack('image set --property a=b --property c=d ' + self.NAME) + raw_output = self.openstack('image show ' + self.NAME + opts) self.assertEqual(self.NAME + "\na='b', c='d'\n", raw_output) |