summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMonty Taylor <mordred@inaugust.com>2018-02-02 17:36:03 -0600
committerMonty Taylor <mordred@inaugust.com>2018-02-05 17:00:08 -0600
commit07014e09c9393364d12cf27f5462ceea15de0658 (patch)
tree2f249d8a8a4989ab2e4b0feb8668711fbf190d0f
parent25e60a4bf1184f2d9006d50d52ced1b5c83737af (diff)
downloadpython-openstackclient-07014e09c9393364d12cf27f5462ceea15de0658.tar.gz
Make osc-functional-devstack-tips actually use tips
The base job has tox_install_siblings: false - which we want. But that means we need tox_install_siblings: true on the tips job. While we're at it - add fetch-tox-output so that we have tox log files in the fetched build output for easier verification of what wound up installed. Don't look for ResourceNotFound string in test The string ResourceNotFound is not in the error string anymore. Look for the text that is. Depends-On: https://review.openstack.org/541033 Change-Id: Id6de1485bcafb41f238f3e74277094ce64a6acf4
-rw-r--r--.zuul.yaml1
-rw-r--r--openstackclient/tests/functional/common/test_extension.py2
-rw-r--r--playbooks/osc-devstack/post.yaml1
3 files changed, 3 insertions, 1 deletions
diff --git a/.zuul.yaml b/.zuul.yaml
index c19c7a02..1080b3ff 100644
--- a/.zuul.yaml
+++ b/.zuul.yaml
@@ -175,6 +175,7 @@
s-object: false
s-proxy: false
tox_envlist: functional
+ tox_install_siblings: true
- project-template:
name: osc-tox-unit-tips
diff --git a/openstackclient/tests/functional/common/test_extension.py b/openstackclient/tests/functional/common/test_extension.py
index e3a91fe6..db50855f 100644
--- a/openstackclient/tests/functional/common/test_extension.py
+++ b/openstackclient/tests/functional/common/test_extension.py
@@ -105,7 +105,7 @@ class ExtensionTests(base.TestCase):
try:
self.openstack('extension show ' + name)
except tempest_exc.CommandFailed as e:
- self.assertIn('ResourceNotFound', str(e))
+ self.assertIn('No Extension found for', str(e))
self.assertIn(name, str(e))
else:
self.fail('CommandFailed should be raised')
diff --git a/playbooks/osc-devstack/post.yaml b/playbooks/osc-devstack/post.yaml
index a1983648..7f0cb198 100644
--- a/playbooks/osc-devstack/post.yaml
+++ b/playbooks/osc-devstack/post.yaml
@@ -1,3 +1,4 @@
- hosts: all
roles:
+ - fetch-tox-output
- fetch-subunit-output