From 68435a8102248d4c3e4ae167ba152a534668ece4 Mon Sep 17 00:00:00 2001 From: debugtalk Date: Sun, 5 Aug 2018 23:55:50 +0800 Subject: [PATCH] replace SuiteNotFound with TestcaseNotFound --- httprunner/exceptions.py | 3 --- httprunner/loader.py | 6 +++--- tests/test_loader.py | 2 +- 3 files changed, 4 insertions(+), 7 deletions(-) diff --git a/httprunner/exceptions.py b/httprunner/exceptions.py index 7eeeb7c8..df18543f 100644 --- a/httprunner/exceptions.py +++ b/httprunner/exceptions.py @@ -50,8 +50,5 @@ class VariableNotFound(NotFoundError): class ApiNotFound(NotFoundError): pass -class SuiteNotFound(NotFoundError): - pass - class TestcaseNotFound(NotFoundError): pass diff --git a/httprunner/loader.py b/httprunner/loader.py index 02eb2f3e..85778af8 100644 --- a/httprunner/loader.py +++ b/httprunner/loader.py @@ -337,9 +337,9 @@ def _get_block_by_name(ref_call, ref_type): def _get_test_definition(name, ref_type): - """ get expected api or suite. + """ get expected api or testcase. @params: - name: api or suite name + name: api or testcase name ref_type: "api" or "suite" @return expected api info if found, otherwise raise ApiNotFound exception @@ -352,7 +352,7 @@ def _get_test_definition(name, ref_type): raise exceptions.ApiNotFound(err_msg) else: # ref_type == "suite": - raise exceptions.SuiteNotFound(err_msg) + raise exceptions.TestcaseNotFound(err_msg) return block diff --git a/tests/test_loader.py b/tests/test_loader.py index fa059ab1..869e3f5a 100644 --- a/tests/test_loader.py +++ b/tests/test_loader.py @@ -231,7 +231,7 @@ class TestSuiteLoader(unittest.TestCase): api_def = loader._get_test_definition("create_and_check", "suite") self.assertEqual(api_def["config"]["name"], "create user and check result.") - with self.assertRaises(exceptions.SuiteNotFound): + with self.assertRaises(exceptions.TestcaseNotFound): loader._get_test_definition("create_and_check_XXX", "suite") def test_merge_validator(self):