GithubBackup/httprunner
1
0
Fork 0
mirror of https://github.com/httprunner/httprunner.git synced 2026-09-04 23:16:57 +08:00
Code Issues Packages Projects Releases Wiki Activity

fix: unittest

Browse Source
This commit is contained in:
debugtalk
2022-05-25 11:17:19 +08:00
parent 63dc9696df
commit d8383e36d8
15 changed files with 25 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files
hrp/runner.go
+8 -6
View File
@@ -289,18 +289,20 @@ func (r *testCaseRunner) parseConfig() error {
// merge config environment variables with base_url
// priority: env base_url > base_url
if cfg.Env != nil {
r.parsedConfig.Env = cfg.Env
if cfg.Environs != nil {
r.parsedConfig.Environs = cfg.Environs
} else {
r.parsedConfig.Env = make(map[string]string)
r.parsedConfig.Environs = make(map[string]string)
}
if value, ok := r.parsedConfig.Env["base_url"]; !ok || value == "" {
r.parsedConfig.Env["base_url"] = r.parsedConfig.BaseURL
if value, ok := r.parsedConfig.Environs["base_url"]; !ok || value == "" {
if r.parsedConfig.BaseURL != "" {
r.parsedConfig.Environs["base_url"] = r.parsedConfig.BaseURL
}
}
// merge config variables with environment variables
// priority: env > config variables
for k, v := range r.parsedConfig.Env {
for k, v := range r.parsedConfig.Environs {
r.parsedConfig.Variables[k] = v
}