fix #1233: parse upload info with session variables

docs/CHANGELOG.md

@@ -2,8 +2,9 @@
 
 ## 3.1.9 (2022-04-17)
 
-- fix #1247: catch exceptions caused by GA report failure
+- fix #1233: parse upload info with session variables
 - fix #1246: catch exceptions when getting socket address failed
+- fix #1247: catch exceptions caused by GA report failure
 
 ## 3.1.8 (2022-03-22)
 

httprunner/ext/uploader/__init__.py

@@ -47,7 +47,7 @@ import sys
 from typing import Text
 
 from httprunner.models import TStep, FunctionsMapping
-from httprunner.parser import parse_variables_mapping
+from httprunner.parser import parse_variables_mapping, parse_data
 from loguru import logger
 
 try:
@@ -101,6 +101,11 @@ def prepare_upload_step(step: TStep, functions: FunctionsMapping):
     if not step.request.upload:
         return
 
+    # parse upload info
+    step.request.upload = parse_data(
+        step.request.upload, step.variables, functions
+    )
+
     ensure_upload_ready()
     params_list = []
     for key, value in step.request.upload.items():

httprunner/parser.py

@@ -2,7 +2,7 @@ import ast
 import builtins
 import re
 import os
-from typing import Any, Set, Text, Callable, List, Dict, Union
+from typing import Any, Set, Text, Callable, List, Dict
 
 from loguru import logger
 from sentry_sdk import capture_exception