summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRyota MIBU <r-mibu@cq.jp.nec.com>2018-01-15 15:48:45 +0900
committerRyota MIBU <r-mibu@cq.jp.nec.com>2018-01-15 16:00:23 +0900
commitffb504843611959b983614bd7b316cd3c205fd49 (patch)
treef0eb6f80b8de7775ffe4d93f035a1091d7e87d35
parent8b4fa81e06057e2e0fbda2071c6fbf46cda7a45f (diff)
change test_case optionHEADmaster
This patch changes the way to specify target test case to be run, 'test_fault_management' --> 'fault_management'. Also, the default is set to 'fault_management'. The reason to this is not to block any other on-going activities for Fraser release. Change-Id: I92305477a84ffa0e703c36d309fbdf97435782aa Signed-off-by: Ryota MIBU <r-mibu@cq.jp.nec.com>
-rw-r--r--doctor_tests/main.py8
-rw-r--r--doctor_tests/scenario/__init__.py9
2 files changed, 14 insertions, 3 deletions
diff --git a/doctor_tests/main.py b/doctor_tests/main.py
index f54b640..5bd3c59 100644
--- a/doctor_tests/main.py
+++ b/doctor_tests/main.py
@@ -163,7 +163,13 @@ class DoctorTest(object):
self.test_fault_management()
self.test_maintenance()
else:
- getattr(self, self.conf.test_case)()
+ function = 'test_%s' % self.conf.test_case
+ if hasattr(self, function):
+ getattr(self, function)()
+ else:
+ raise Exception('Can not find function <%s> in'
+ 'DoctorTest, see config manual'
+ % function)
except Exception as e:
LOG.error('doctor test failed, Exception=%s' % e)
sys.exit(1)
diff --git a/doctor_tests/scenario/__init__.py b/doctor_tests/scenario/__init__.py
index 9e7cd11..b9dfa30 100644
--- a/doctor_tests/scenario/__init__.py
+++ b/doctor_tests/scenario/__init__.py
@@ -11,7 +11,12 @@ from oslo_config import cfg
OPTS = [
cfg.StrOpt('test_case',
- default='all',
- help='the name of test case',
+ default='fault_management',
+ 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"
+ " this repo. Default is 'fault_management'. Another test"
+ " case can be specified only if a function named"
+ " test_<test_case>() was implemented in DoctorTest.",
required=False),
]