From bf117b671ca1dc6322bbc96782df082fcbd8a9e7 Mon Sep 17 00:00:00 2001 From: debugtalk Date: Wed, 30 Aug 2017 12:18:32 +0800 Subject: [PATCH] filter if files do not include testcases --- ate/utils.py | 4 ++-- tests/test_utils.py | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/ate/utils.py b/ate/utils.py index 1b6c22ae..4922c0d3 100644 --- a/ate/utils.py +++ b/ate/utils.py @@ -96,7 +96,7 @@ def load_testcases_by_path(path): path = os.path.join(os.getcwd(), path) if os.path.isdir(path): - files_list = load_foler_files(path, ["*.yml", "*.json"]) + files_list = load_foler_files(path, ["*.yml", "*.yaml", "*.json"]) return load_testcases_by_path(files_list) elif os.path.isfile(path): @@ -115,7 +115,7 @@ def load_testcases_by_path(path): elif key == "test": testset["testcases"].append(item["test"]) - return [testset] + return [testset] if testset["testcases"] else [] else: return [] diff --git a/tests/test_utils.py b/tests/test_utils.py index f6d2976d..18379b83 100644 --- a/tests/test_utils.py +++ b/tests/test_utils.py @@ -81,7 +81,7 @@ class TestUtils(ApiServerUnittest): # absolute folder path path = os.path.join(os.getcwd(), 'tests/data') testset_list_1 = utils.load_testcases_by_path(path) - self.assertGreater(len(testset_list_1), 5) + self.assertGreater(len(testset_list_1), 4) # relative folder path path = 'tests/data/'