From 07014e09c9393364d12cf27f5462ceea15de0658 Mon Sep 17 00:00:00 2001 From: Monty Taylor Date: Fri, 2 Feb 2018 17:36:03 -0600 Subject: [PATCH] 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 --- .zuul.yaml | 1 + openstackclient/tests/functional/common/test_extension.py | 2 +- playbooks/osc-devstack/post.yaml | 1 + 3 files changed, 3 insertions(+), 1 deletion(-) diff --git a/.zuul.yaml b/.zuul.yaml index c19c7a022b..1080b3ffa4 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 e3a91fe657..db50855f71 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 a198364866..7f0cb19824 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