Skip to content

config: Make run id header optional #3

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
shahar99s wants to merge 1 commit into
base: main
Choose a base branch
from
Open

config: Make run id header optional #3

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions httprunner/config.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -115,6 +115,10 @@ def verify(self, verify: bool) -> "Config":
self.__config.verify = verify
return self

def add_request_id(self, add_request_id: bool) -> "Config":
self.__config.add_request_id = add_request_id
return self

def export(self, *export_var_name: Text) -> "Config":
self.__config.export.extend(export_var_name)
self.__config.export = list(set(self.__config.export))
Expand Down
1 change: 1 addition & 0 deletions httprunner/models.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -118,6 +118,7 @@ class TConfig(BaseModel):
name: Name
verify: Verify = False
base_url: BaseUrl = ""
add_request_id: bool = True
# Text: prepare variables in debugtalk.py, ${gen_variables()}
variables: Union[VariablesMapping, Text] = {}
parameters: Union[VariablesMapping, Text] = {}
Expand Down
7 changes: 4 additions & 3 deletions httprunner/step_request.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -102,9 +102,10 @@ def run_step_request(runner: HttpRunner, step: TStep) -> StepResult:
request_headers = {
key: request_headers[key] for key in request_headers if not key.startswith(":")
}
request_headers[
"HRUN-Request-ID"
] = f"HRUN-{runner.case_id}-{str(int(time.time() * 1000))[-6:]}"
if runner.get_config().add_request_id:
request_headers[
"HRUN-Request-ID"
] = f"HRUN-{runner.case_id}-{str(int(time.time() * 1000))[-6:]}"
parsed_request_dict["headers"] = request_headers

step_variables["request"] = parsed_request_dict
Expand Down
9 changes: 5 additions & 4 deletions httprunner/step_sql_request.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -85,10 +85,11 @@ def run_step_sql_request(runner: HttpRunner, step: TStep) -> StepResult:
f"?charset=utf8mb4"
)

# parsed_request_dict["headers"].setdefault(
# "HRUN-Request-ID",
# f"HRUN-{self.__case_id}-{str(int(time.time() * 1000))[-6:]}",
# )
# if runner.config.add_request_id:
# parsed_request_dict["headers"].setdefault(
# "HRUN-Request-ID",
# f"HRUN-{self.__case_id}-{str(int(time.time() * 1000))[-6:]}",
# )

# setup hooks
if step.setup_hooks:
Expand Down
9 changes: 5 additions & 4 deletions httprunner/step_thrift_request.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -95,10 +95,11 @@ def run_step_thrift_request(runner: HttpRunner, step: TStep) -> StepResult:
)
parsed_request_dict["thrift_client"] = parsed_request_dict["thrift_client"]

# parsed_request_dict["headers"].setdefault(
# "HRUN-Request-ID",
# f"HRUN-{self.__case_id}-{str(int(time.time() * 1000))[-6:]}",
# )
# if runner.config.add_request_id:
# parsed_request_dict["headers"].setdefault(
# "HRUN-Request-ID",
# f"HRUN-{self.__case_id}-{str(int(time.time() * 1000))[-6:]}",
# )
step_variables["thrift_request"] = parsed_request_dict

psm = parsed_request_dict["psm"]
Expand Down