summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorZuul <zuul@review.openstack.org>2018-01-22 17:32:55 +0000
committerGerrit Code Review <review@openstack.org>2018-01-22 17:32:55 +0000
commit5db05b85a2e90150b6adceb21cd4d03b896eb124 (patch)
tree39a14ef669caebad697e28c679df5e1e657ecaeb
parentf3dcdd472a9bb78bc48c18473ed646924a7184fd (diff)
parentecce1f64f76ac2121091ec4310e715b392bcc678 (diff)
Merge "Fixed _log_console_output call on failure"HEADmaster
-rw-r--r--barbican_tempest_plugin/tests/scenario/manager.py4
1 files changed, 2 insertions, 2 deletions
diff --git a/barbican_tempest_plugin/tests/scenario/manager.py b/barbican_tempest_plugin/tests/scenario/manager.py
index e7957cb..8a8ca9d 100644
--- a/barbican_tempest_plugin/tests/scenario/manager.py
+++ b/barbican_tempest_plugin/tests/scenario/manager.py
@@ -25,14 +25,14 @@ from tempest import exceptions
25from tempest.lib.common.utils import data_utils 25from tempest.lib.common.utils import data_utils
26from tempest.lib.common.utils import test_utils 26from tempest.lib.common.utils import test_utils
27from tempest.lib import exceptions as lib_exc 27from tempest.lib import exceptions as lib_exc
28import tempest.test 28from tempest.scenario import manager
29 29
30CONF = config.CONF 30CONF = config.CONF
31 31
32LOG = log.getLogger(__name__) 32LOG = log.getLogger(__name__)
33 33
34 34
35class ScenarioTest(tempest.test.BaseTestCase): 35class ScenarioTest(manager.ScenarioTest):
36 """Base class for scenario tests. Uses tempest own clients. """ 36 """Base class for scenario tests. Uses tempest own clients. """
37 37
38 credentials = ['primary'] 38 credentials = ['primary']