From 9044bfb9718a1f1d70a8642f16f385932f72c341 Mon Sep 17 00:00:00 2001
From: debugtalk <mail@debugtalk.com>
Date: Tue, 13 Mar 2018 21:05:27 +0800
Subject: [PATCH] relocate kwargs preparation

---
 httprunner/client.py | 13 +++++++------
 httprunner/runner.py | 12 ++++++------
 2 files changed, 13 insertions(+), 12 deletions(-)

diff --git a/httprunner/client.py b/httprunner/client.py
index 72fb71d9..16dc56d3 100644
--- a/httprunner/client.py
+++ b/httprunner/client.py
@@ -43,6 +43,13 @@ def prepare_kwargs(method, kwargs):
             if charset:
                 kwargs["data"] = kwargs["data"].encode(charset)
 
+    if "httpntlmauth" in kwargs:
+        from requests_ntlm import HttpNtlmAuth
+        auth_account = kwargs.pop("httpntlmauth")
+        kwargs["auth"] = HttpNtlmAuth(
+            auth_account["username"], auth_account["password"])
+
+
 class ApiResponse(Response):
 
     def raise_for_status(self):
@@ -127,12 +134,6 @@ class HttpSession(requests.Session):
         # set up pre_request hook for attaching meta data to the request object
         self.meta_data["method"] = method
 
-        if "httpntlmauth" in kwargs:
-            from requests_ntlm import HttpNtlmAuth
-            auth_account = kwargs.pop("httpntlmauth")
-            kwargs["auth"] = HttpNtlmAuth(
-                auth_account["username"], auth_account["password"])
-
         kwargs.setdefault("timeout", 120)
 
         self.meta_data["request_time"] = time.time()
diff --git a/httprunner/runner.py b/httprunner/runner.py
index 7ab58cae..18b1b960 100644
--- a/httprunner/runner.py
+++ b/httprunner/runner.py
@@ -92,6 +92,10 @@ class Runner(object):
         if skip_reason:
             raise SkipTest(skip_reason)
 
+    def setup_teardown(self, actions):
+        for action in actions:
+            self.context.eval_content(action)
+
     def run_test(self, testcase_dict):
         """ run single testcase.
         @param (dict) testcase_dict
@@ -135,11 +139,7 @@ class Runner(object):
 
         self._handle_skip_feature(testcase_dict)
 
-        def setup_teardown(actions):
-            for action in actions:
-                self.context.eval_content(action)
-
-        setup_teardown(setup_actions)
+        self.setup_teardown(setup_actions)
 
         resp = self.http_client_session.request(
             method,
@@ -171,7 +171,7 @@ class Runner(object):
 
             raise
         finally:
-            setup_teardown(teardown_actions)
+            self.setup_teardown(teardown_actions)
 
     def extract_output(self, output_variables_list):
         """ extract output variables