TestRunner: testsets can be configured in public config

ate/runner.py

@@ -12,27 +12,53 @@ class TestRunner(object):
         self.context = Context()
         self.testcase_parser = TestcaseParser()
 
-    def prepare(self, testcase):
+    def pre_config(self, config_dict):
-        """ prepare work before running test.
+        """ create/update variables binds
-        parse testcase with variables binds if it is a template.
+        @param config_dict
+            {
+                "requires": ["random", "hashlib"],
+                "function_binds": {
+                    "gen_random_string": \
+                        "lambda str_len: ''.join(random.choice(string.ascii_letters + \
+                        string.digits) for _ in range(str_len))",
+                    "gen_md5": \
+                        "lambda *str_args: hashlib.md5(''.join(str_args).\
+                        encode('utf-8')).hexdigest()"
+                },
+                "variable_binds": [
+                    {"TOKEN": "debugtalk"},
+                    {"random": {"func": "gen_random_string", "args": [5]}},
+                ]
+            }
+        @return variables binds mapping
+            {
+                "TOKEN": "debugtalk",
+                "random": "A2dEx"
+            }
         """
-        requires = testcase.get('requires', [])
+        requires = config_dict.get('requires', [])
         self.context.import_requires(requires)
 
-        function_binds = testcase.get('function_binds', {})
+        function_binds = config_dict.get('function_binds', {})
         self.context.bind_functions(function_binds)
 
-        variable_binds = testcase.get('variable_binds', [])
+        variable_binds = config_dict.get('variable_binds', [])
         self.context.bind_variables(variable_binds)
 
-        parsed_testcase = self.testcase_parser.parse(
+        self.testcase_parser.update_variables_binds(self.context.variables)
-            testcase,
+
-            variables_binds=self.context.variables
+    def parse_testcase(self, testcase):
-        )
+        """ parse testcase with variables binds if it is a template.
+        """
+        self.pre_config(testcase)
+
+        parsed_testcase = self.testcase_parser.parse(testcase)
         return parsed_testcase
 
     def run_test(self, testcase):
-        testcase = self.prepare(testcase)
+        """ run single testcase.
+        """
+        testcase = self.parse_testcase(testcase)
 
         req_kwargs = testcase['request']
 
@@ -48,7 +74,34 @@ class TestRunner(object):
         return success, diff_content
 
     def run_testsets(self, testsets):
-        return [
+        """ run testcase suite.
-            self.run_test(testcase)
+        @testsets
-            for testcase in testsets
+            [
-        ]
+                {
+                    "config": {
+                        "requires": [],
+                        "function_binds": {},
+                        "variable_binds": []
+                    }
+                },
+                {
+                    "test": {
+                        "variable_binds": {}, # override
+                        "request": {},
+                        "response": {}
+                    }
+                }
+            ]
+        """
+        results = []
+        for item in testsets:
+            for key in item:
+                if key == "config":
+                    config_dict = item[key]
+                    self.pre_config(config_dict)
+                elif key == "test":
+                    testcase = item[key]
+                    result = self.run_test(testcase)
+                    results.append(result)
+
+        return results

test/data/demo_template_separate.yml

@@ -58,5 +58,5 @@
         headers:
             Content-Type: application/json
         body:
-            success: true
+            success: false
-            msg: user created successfully.
+            msg: user already existed.

test/data/demo_template_sets.yml

@@ -0,0 +1,56 @@
+- config:
+    name: "create user testsets."
+    requires:
+        - random
+        - string
+        - hashlib
+    function_binds:
+        gen_random_string: "lambda str_len: ''.join(random.choice(string.ascii_letters + string.digits) for _ in range(str_len))"
+        gen_md5: "lambda *str_args: hashlib.md5(''.join(str_args).encode('utf-8')).hexdigest()"
+    variable_binds:
+        - TOKEN: debugtalk
+        - random: {"func": "gen_random_string", "args": [5]}
+        - data: '{"name": "user", "password": "123456"}'
+        - authorization: {"func": "gen_md5", "args": ["$TOKEN", "$data", "$random"]}
+
+- test:
+    name: create user which does not exist
+    variable_binds:
+        - data: '{"name": "user", "password": "123456"}'
+        - expected_status_code: 201
+    request:
+        url: http://127.0.0.1:5000/api/users/1000
+        method: POST
+        headers:
+            Content-Type: application/json
+            authorization: "${authorization}"
+            random: "${random}"
+        data: "${data}"
+    response:
+        status_code: "${expected_status_code}"
+        headers:
+            Content-Type: application/json
+        body:
+            success: true
+            msg: user created successfully.
+
+- test:
+    name: create user which does not exist
+    variable_binds:
+        - data: '{"name": "user", "password": "123456"}'
+        - expected_status_code: 500
+    request:
+        url: http://127.0.0.1:5000/api/users/1000
+        method: POST
+        headers:
+            Content-Type: application/json
+            authorization: "${authorization}"
+            random: "${random}"
+        data: "${data}"
+    response:
+        status_code: "${expected_status_code}"
+        headers:
+            Content-Type: application/json
+        body:
+            success: false
+            msg: user already existed.

test/test_runner_v2.py

@@ -36,17 +36,17 @@ class TestRunnerV2(ApiServerUnittest):
         testcase_file_path = os.path.join(
             os.getcwd(), 'test/data/simple_demo_auth_hardcode.yml')
         testcases = utils.load_testcases(testcase_file_path)
-        result = self.test_runner.run_testsets(testcases)
+        results = self.test_runner.run_testsets(testcases)
-        self.assertEqual(len(result), 2)
+        self.assertEqual(len(results), 2)
-        self.assertEqual(result, [(True, {}), (True, {})])
+        self.assertEqual(results, [(True, {}), (True, {})])
 
     def test_run_testcase_auth_suite_json(self):
         testcase_file_path = os.path.join(
             os.getcwd(), 'test/data/simple_demo_auth_hardcode.json')
         testcases = utils.load_testcases(testcase_file_path)
-        result = self.test_runner.run_testsets(testcases)
+        results = self.test_runner.run_testsets(testcases)
-        self.assertEqual(len(result), 2)
+        self.assertEqual(len(results), 2)
-        self.assertEqual(result, [(True, {}), (True, {})])
+        self.assertEqual(results, [(True, {}), (True, {})])
 
     def test_run_testcase_template_yaml(self):
         testcase_file_path = os.path.join(
@@ -55,4 +55,11 @@ class TestRunnerV2(ApiServerUnittest):
         success, _ = self.test_runner.run_test(testcases[0]["test"])
         self.assertTrue(success)
         success, _ = self.test_runner.run_test(testcases[1]["test"])
-        self.assertFalse(success)
+        self.assertTrue(success)
+
+    def test_run_testcase_template_sets_yaml(self):
+        testcase_file_path = os.path.join(
+            os.getcwd(), 'test/data/demo_template_sets.yml')
+        testcases = utils.load_testcases(testcase_file_path)
+        results = self.test_runner.run_testsets(testcases)
+        self.assertEqual(results, [(True, {}), (True, {})])