From acdd5599a4f044a383b28620c7f05c74164a01df Mon Sep 17 00:00:00 2001 From: debugtalk Date: Tue, 27 Jun 2017 19:17:48 +0800 Subject: [PATCH] load_testcases_by_path: make compatible with none exist path --- ate/utils.py | 5 ++++- test/test_utils.py | 19 +++++++++++++++++++ 2 files changed, 23 insertions(+), 1 deletion(-) diff --git a/ate/utils.py b/ate/utils.py index 57f141f1..6c10da68 100644 --- a/ate/utils.py +++ b/ate/utils.py @@ -167,7 +167,7 @@ def load_testcases_by_path(path): files_list = load_foler_files(path) return load_testcases_by_path(files_list) - if os.path.isfile(path): + elif os.path.isfile(path): testset = { "name": "", "config": {}, @@ -187,3 +187,6 @@ def load_testcases_by_path(path): testset["testcases"].append(item["test"]) return [testset] + + else: + return [] diff --git a/test/test_utils.py b/test/test_utils.py index 6130adb8..6e1dc093 100644 --- a/test/test_utils.py +++ b/test/test_utils.py @@ -306,3 +306,22 @@ class TestUtils(ApiServerUnittest): ] testset_list_3 = utils.load_testcases_by_path(path) self.assertEqual(len(testset_list_3), 2 * len(testset_list_1)) + + def test_load_testcases_by_path_not_exist(self): + # absolute folder path + path = os.path.join(os.getcwd(), 'test/data_not_exist') + testset_list_1 = utils.load_testcases_by_path(path) + self.assertEqual(testset_list_1, []) + + # relative folder path + path = 'test/data_not_exist' + testset_list_2 = utils.load_testcases_by_path(path) + self.assertEqual(testset_list_2, []) + + # list/set container with file(s) + path = [ + os.path.join(os.getcwd(), 'test/data_not_exist'), + 'test/data_not_exist/' + ] + testset_list_3 = utils.load_testcases_by_path(path) + self.assertEqual(testset_list_3, [])