From 12341577ecf885f61e4fc82abf64e1c94eb1bf95 Mon Sep 17 00:00:00 2001
From: debugtalk <mail@debugtalk.com>
Date: Thu, 4 Jun 2020 13:18:52 +0800
Subject: [PATCH] fix: override testsuite/testcase config verify

---
 httprunner/make.py   | 11 +++++++----
 httprunner/runner.py |  1 +
 2 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/httprunner/make.py b/httprunner/make.py
index 4d2585af..eaa7d309 100644
--- a/httprunner/make.py
+++ b/httprunner/make.py
@@ -329,10 +329,10 @@ def make_testsuite(testsuite: Dict) -> NoReturn:
     # validate testsuite format
     load_testsuite(testsuite)
 
-    config = testsuite["config"]
-    testsuite_path = config["path"]
+    testsuite_config = testsuite["config"]
+    testsuite_path = testsuite_config["path"]
 
-    testsuite_variables = config.get("variables", {})
+    testsuite_variables = testsuite_config.get("variables", {})
     if isinstance(testsuite_variables, Text):
         # get variables by function, e.g. ${get_variables()}
         project_meta = load_project_meta(testsuite_path)
@@ -360,9 +360,12 @@ def make_testsuite(testsuite: Dict) -> NoReturn:
         # override testcase name
         testcase_dict["config"]["name"] = testcase["name"]
         # override base_url
-        base_url = testsuite["config"].get("base_url") or testcase.get("base_url")
+        base_url = testsuite_config.get("base_url") or testcase.get("base_url")
         if base_url:
             testcase_dict["config"]["base_url"] = base_url
+        # override verify
+        if "verify" in testsuite_config:
+            testcase_dict["config"]["verify"] = testsuite_config["verify"]
         # override variables
         testcase_dict["config"].setdefault("variables", {})
         testcase_dict["config"]["variables"].update(testcase.get("variables", {}))
diff --git a/httprunner/runner.py b/httprunner/runner.py
index 9b94cf5e..d3e324b1 100644
--- a/httprunner/runner.py
+++ b/httprunner/runner.py
@@ -101,6 +101,7 @@ class HttpRunner(object):
         method = parsed_request_dict.pop("method")
         url_path = parsed_request_dict.pop("url")
         url = build_url(self.__config.base_url, url_path)
+        parsed_request_dict["verify"] = self.__config.verify
         parsed_request_dict["json"] = parsed_request_dict.pop("req_json", {})
 
         # request