summaryrefslogtreecommitdiff
path: root/openstackclient/tests/functional
diff options
context:
space:
mode:
authorZuul <zuul@review.openstack.org>2017-10-27 18:29:07 +0000
committerGerrit Code Review <review@openstack.org>2017-10-27 18:29:07 +0000
commitd215982ce04302a95086e574322046ef5a4b439c (patch)
tree11a8b226c221faca8a1f0a7d31f0dc4083d136b2 /openstackclient/tests/functional
parent21212cabd52c85fdd572fc0c230868106a7f8eda (diff)
parentfd23ebfbf3080b96f7ef8ba516b64e67a111971d (diff)
downloadpython-openstackclient-d215982ce04302a95086e574322046ef5a4b439c.tar.gz
Merge "Add missing parameters on openstack server rescue"
Diffstat (limited to 'openstackclient/tests/functional')
-rw-r--r--openstackclient/tests/functional/compute/v2/test_server.py13
1 files changed, 12 insertions, 1 deletions
diff --git a/openstackclient/tests/functional/compute/v2/test_server.py b/openstackclient/tests/functional/compute/v2/test_server.py
index b7a25996..0b29fe5f 100644
--- a/openstackclient/tests/functional/compute/v2/test_server.py
+++ b/openstackclient/tests/functional/compute/v2/test_server.py
@@ -184,7 +184,18 @@ class ServerTests(common.ComputeTestCase):
# rescue
raw_output = self.openstack('server rescue ' + name)
- self.assertNotEqual("", raw_output)
+ self.assertEqual("", raw_output)
+ self.wait_for_status(name, "RESCUE")
+
+ # unrescue
+ raw_output = self.openstack('server unrescue ' + name)
+ self.assertEqual("", raw_output)
+ self.wait_for_status(name, "ACTIVE")
+
+ # rescue with image
+ raw_output = self.openstack('server rescue --image ' +
+ self.image_name + ' ' + name)
+ self.assertEqual("", raw_output)
self.wait_for_status(name, "RESCUE")
# unrescue