更新请求数据日志记录 (#205)

httpfpt/common/send_request.py

@@ -188,11 +188,6 @@ def send_request(
                 raise e
             log.info('请求前置处理完成')
 
-        # 日志记录请求数据
-        if log_data:
-            self.log_request_up(parsed_data)
-            self.allure_request_up(parsed_data)
-
         # allure 记录动态数据
         self.allure_dynamic_data(parsed_data)
 
@@ -222,10 +217,20 @@ def send_request(
             request_data_parsed.update({'data': request_data_parsed.pop('body')})
         try:
             request_data_parsed = var_extractor.vars_replace(request_data_parsed, parsed_data['env'])
+            parsed_data.update(
+                body=request_data_parsed.get('json')
+                or request_data_parsed.get('data')
+                or request_data_parsed.get('content')
+            )
         except Exception as e:
             log.error(e)
             raise e
 
+        # 日志记录请求数据
+        if log_data:
+            self.log_request_up(parsed_data)
+            self.allure_request_up(parsed_data)
+
         # 发送请求
         response_data = self.init_response_metadata
         response_data['stat']['execute_time'] = get_current_time()
@@ -330,11 +335,8 @@ def log_request_up(parsed_data: dict) -> None:
         log.info(f"请求 url: {parsed_data['url']}")
         log.info(f"请求 params: {parsed_data['params']}")
         log.info(f"请求 headers: {parsed_data['headers']}")
-        log.info(f"请求 data_type：{parsed_data['body_type']}")
-        if parsed_data['body_type'] != BodyType.JSON:
-            log.info(f"请求 data：{parsed_data['body']}")
-        else:
-            log.info(f"请求 json: {parsed_data['body']}")
+        log.info(f"请求 body_type：{parsed_data['body_type']}")
+        log.info(f"请求 body：{parsed_data['body']}")
         log.info(f"请求 files: {parsed_data['files_no_parse']}")
 
     def log_request_teardown(self, teardown: list) -> None:
@@ -384,8 +386,8 @@ def allure_request_up(parsed_data: dict) -> None:
                 'url': parsed_data['url'],
                 'params': parsed_data['params'],
                 'headers': parsed_data['headers'],
-                'data_type': parsed_data['body_type'],
-                'data': parsed_data['body'],
+                'body_type': parsed_data['body_type'],
+                'body': parsed_data['body'],
                 'files': parsed_data['files_no_parse'],
             },
         )

httpfpt/data/global_vars.yaml

@@ -4,11 +4,6 @@ headers:
   Accept-Language: zh-CN,zh;q=0.9
   User-Agent: ''' Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML,
     like Gecko) Chrome/86.0.4240.198 Safari/537.36 '''
-proxies:
-  http: null
-  https: null
-redirects: null
 test: https://jsonplaceholder.typicode.com
 test_global: '200'
-timeout: null
-verify: null
+timeout: 5

httpfpt/data/test_data/test_project/only_skip.yml

@@ -47,7 +47,7 @@ test_steps:
     is_run:
       skip_if:
         - ${random_phone()} == 2
-        - ${timeout} == None
+        - ${timeout} == 5
       reason: 条件判断为真跳过
     request:
       method: GET