From bb3dcb2756626ee3b78da33b75129d9919ee2e75 Mon Sep 17 00:00:00 2001 From: debugtalk Date: Thu, 15 Nov 2018 20:05:57 +0800 Subject: [PATCH] refactor is_function --- httprunner/loader.py | 2 +- httprunner/validator.py | 5 ++--- tests/test_validator.py | 5 ++--- 3 files changed, 5 insertions(+), 7 deletions(-) diff --git a/httprunner/loader.py b/httprunner/loader.py index acb65fbc..d7738893 100644 --- a/httprunner/loader.py +++ b/httprunner/loader.py @@ -239,7 +239,7 @@ def load_module_functions(module): module_functions = {} for name, item in vars(module).items(): - if validator.is_function((name, item)): + if validator.is_function(item): module_functions[name] = item return module_functions diff --git a/httprunner/validator.py b/httprunner/validator.py index b4c8601e..54d7ffc9 100644 --- a/httprunner/validator.py +++ b/httprunner/validator.py @@ -105,10 +105,9 @@ def is_testcase_path(path): ############################################################################### -def is_function(tup): - """ Takes (name, object) tuple, returns True if it is a function. +def is_function(item): + """ Takes item object, returns True if it is a function. """ - name, item = tup return isinstance(item, types.FunctionType) diff --git a/tests/test_validator.py b/tests/test_validator.py index 49a291f6..f83d876f 100644 --- a/tests/test_validator.py +++ b/tests/test_validator.py @@ -50,6 +50,5 @@ class TestValidator(unittest.TestCase): def test_is_function(self): func = lambda x: x + 1 - self.assertTrue(validator.is_function(("func", func))) - - self.assertTrue(validator.is_function(("func", validator.is_testcase))) + self.assertTrue(validator.is_function(func)) + self.assertTrue(validator.is_function(validator.is_testcase))