summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorxudan <xudan16@huawei.com>2019-05-09 07:42:19 -0400
committerDan Xu <xudan16@huawei.com>2019-05-16 02:00:09 +0000
commit47559a6afe2c66ff536c45f61be730991042b68d (patch)
tree4906aac52513360a4227621b162460f511a73099
parent418cce60e12698b0a4d1c4518070cf290a9f6581 (diff)
Fix the verdict of sub test cases
Error to group skipped sub test cases to passed one. Example: Skipped sub test case will be parsed as passed in following case. skipped sub test case: tempest.api.network.test_routers.RoutersTest.test_create_show_list_update_delete_router passed sub test case list includes this one: tempest.api.network.test_routers.RoutersTest.test_add_remove_router_interface_with_subnet_id Then the skipped one will be checked as pass. JIRA: DOVETAIL-775 Change-Id: I449f4968c23a9def1177a7c9645e5dcb89b2ec30 Signed-off-by: xudan <xudan16@huawei.com>
-rw-r--r--dovetail/report.py2
-rw-r--r--dovetail/tests/unit/test_report.py11
2 files changed, 10 insertions, 3 deletions
diff --git a/dovetail/report.py b/dovetail/report.py
index 09cfdcea..65c41484 100644
--- a/dovetail/report.py
+++ b/dovetail/report.py
@@ -597,7 +597,7 @@ class FunctestChecker(object):
match = find_reg.findall(tc)
if match:
return True
- reg = sub_testcase.rsplit('.', 1)[0]
+ reg = sub_testcase.rsplit('.', 1)[0] + '$'
find_reg = re.compile(reg)
for tc in result:
match = find_reg.findall(tc)
diff --git a/dovetail/tests/unit/test_report.py b/dovetail/tests/unit/test_report.py
index 2dcb44e4..4840f2b5 100644
--- a/dovetail/tests/unit/test_report.py
+++ b/dovetail/tests/unit/test_report.py
@@ -1382,8 +1382,15 @@ class ReportTesting(unittest.TestCase):
def test_functest_get_sub_testcase_class_match(self):
self.assertEquals(
True,
- dt_report.FunctestChecker.get_sub_testcase('subclass_a',
- ['subclass_a.subt_a',
+ dt_report.FunctestChecker.get_sub_testcase('subclass_a.subt_a',
+ ['subclass_a',
+ 'subclass_b.subt_b']))
+
+ def test_functest_get_sub_testcase_class_no_match(self):
+ self.assertEquals(
+ False,
+ dt_report.FunctestChecker.get_sub_testcase('subclass_a.subt_a',
+ ['subclass_a.subt_a_a',
'subclass_b.subt_b']))
def test_functest_get_sub_no_match(self):