summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorwenjuan dong <dong.wenjuan@zte.com.cn>2018-04-16 02:57:49 +0000
committerGerrit Code Review <gerrit@opnfv.org>2018-04-16 02:57:49 +0000
commitf06386c6b436a0adce7b96c6a1d59b5d02ed31fb (patch)
tree26576393622f1b8353a18d36a27190abed9200fe
parentbf4c32f2729d1014cf572e17a9974587053e3786 (diff)
parent8298cd6f93c39bd2077d71ece1af93e6d51286c0 (diff)
Merge "get 'test_case' option form environment variable"
-rw-r--r--doctor_tests/scenario/__init__.py5
-rw-r--r--etc/doctor.sample.conf3
2 files changed, 7 insertions, 1 deletions
diff --git a/doctor_tests/scenario/__init__.py b/doctor_tests/scenario/__init__.py
index b9dfa307..4278bb26 100644
--- a/doctor_tests/scenario/__init__.py
+++ b/doctor_tests/scenario/__init__.py
@@ -6,12 +6,15 @@
# which accompanies this distribution, and is available at
# http://www.apache.org/licenses/LICENSE-2.0
##############################################################################
+import os
+
from oslo_config import cfg
OPTS = [
cfg.StrOpt('test_case',
- default='fault_management',
+ default=os.environ.get('TEST_CASE', 'fault_management'),
+ choices=['all', 'fault_management', 'maintenance'],
help="A name of test case to be executed,"
" choices are 'all', 'fault_management' or 'maintenance'."
" Set 'all' to execute all the test cases existing in"
diff --git a/etc/doctor.sample.conf b/etc/doctor.sample.conf
index 6eeea3a5..0e8a49bb 100644
--- a/etc/doctor.sample.conf
+++ b/etc/doctor.sample.conf
@@ -51,3 +51,6 @@
#type = sample
#ip = 127.0.0.1
#port = 12346
+
+[scenario]
+#test_case = fault_management