GithubBackup/httprunner
1
0
Fork 0
mirror of https://github.com/httprunner/httprunner.git synced 2026-07-09 22:44:05 +08:00
Code Issues Packages Projects Releases Wiki Activity

refactor: move base_url to config env

Browse Source
This commit is contained in:
debugtalk
2022-05-24 22:23:02 +08:00
parent f141db43f0
commit 9f48fd1d60
20 changed files with 55 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
hrp/runner.go
View File

@@ -287,6 +287,19 @@ func (r *testCaseRunner) parseConfig() error {
}
r.parsedConfig.BaseURL = convertString(parsedBaseURL)
// merge config environment variables with base_url
// priority: env base_url > base_url
r.parsedConfig.Env = cfg.Env
if value, ok := r.parsedConfig.Env["base_url"]; !ok || value == "" {
r.parsedConfig.Env["base_url"] = r.parsedConfig.BaseURL
}
// merge config variables with environment variables
// priority: env > config variables
for k, v := range r.parsedConfig.Env {
r.parsedConfig.Variables[k] = v
}
// ensure correction of think time config
r.parsedConfig.ThinkTimeSetting.checkThinkTime()