summaryrefslogtreecommitdiff
path: root/openstackclient
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2014-11-18 03:47:30 +0000
committerGerrit Code Review <review@openstack.org>2014-11-18 03:47:30 +0000
commit3b1c308b11adebd4914d3947cb8f3ffb18dfba24 (patch)
tree67c888a80273bca6cb80af3771fc8763709091b6 /openstackclient
parentd827bdaaeda2e8b6ddfaec6959dadfb93bf3e171 (diff)
parent936722d59f4e28e4f6c578074eeb75152458d821 (diff)
downloadpython-openstackclient-3b1c308b11adebd4914d3947cb8f3ffb18dfba24.tar.gz
Merge "Add arg to 'server image create' tests"
Diffstat (limited to 'openstackclient')
-rw-r--r--openstackclient/tests/compute/v2/test_server.py10
-rw-r--r--openstackclient/tests/image/v2/fakes.py5
2 files changed, 10 insertions, 5 deletions
diff --git a/openstackclient/tests/compute/v2/test_server.py b/openstackclient/tests/compute/v2/test_server.py
index 43aa7a70..19c13440 100644
--- a/openstackclient/tests/compute/v2/test_server.py
+++ b/openstackclient/tests/compute/v2/test_server.py
@@ -285,13 +285,14 @@ class TestServerImageCreate(TestServer):
compute_fakes.server_name,
)
- collist = ('id', 'is_public', 'name', 'owner')
+ collist = ('id', 'is_public', 'name', 'owner', 'protected')
self.assertEqual(collist, columns)
datalist = (
image_fakes.image_id,
- False,
+ image_fakes.image_public,
image_fakes.image_name,
image_fakes.image_owner,
+ image_fakes.image_protected,
)
self.assertEqual(datalist, data)
@@ -315,13 +316,14 @@ class TestServerImageCreate(TestServer):
'img-nam',
)
- collist = ('id', 'is_public', 'name', 'owner')
+ collist = ('id', 'is_public', 'name', 'owner', 'protected')
self.assertEqual(collist, columns)
datalist = (
image_fakes.image_id,
- False,
+ image_fakes.image_public,
image_fakes.image_name,
image_fakes.image_owner,
+ image_fakes.image_protected,
)
self.assertEqual(datalist, data)
diff --git a/openstackclient/tests/image/v2/fakes.py b/openstackclient/tests/image/v2/fakes.py
index 96255cd4..1b7edf08 100644
--- a/openstackclient/tests/image/v2/fakes.py
+++ b/openstackclient/tests/image/v2/fakes.py
@@ -22,12 +22,15 @@ from openstackclient.tests import utils
image_id = 'im1'
image_name = 'graven'
image_owner = 'baal'
+image_public = False
+image_protected = False
IMAGE = {
'id': image_id,
'name': image_name,
- 'is_public': False,
+ 'is_public': image_public,
'owner': image_owner,
+ 'protected': image_protected,
}