GithubBackup/httprunner
1
0
Fork 0
mirror of https://github.com/httprunner/httprunner.git synced 2026-06-09 17:59:36 +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 36fb3b22f1
commit 780a7e24e6
15 changed files with 25 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
hrp/config.go
View File

@@ -10,7 +10,7 @@ import (
func NewConfig(name string) *TConfig {
return &TConfig{
Name: name,
Env: make(map[string]string),
Environs: make(map[string]string),
Variables: make(map[string]interface{}),
}
}
@@ -22,7 +22,7 @@ type TConfig struct {
Verify bool `json:"verify,omitempty" yaml:"verify,omitempty"`
BaseURL string `json:"base_url,omitempty" yaml:"base_url,omitempty"` // deprecated in v4.1, moved to env
Headers map[string]string `json:"headers,omitempty" yaml:"headers,omitempty"` // public request headers
Env map[string]string `json:"env,omitempty" yaml:"env,omitempty"` // environment variables
Environs map[string]string `json:"environs,omitempty" yaml:"environs,omitempty"` // environment variables
Variables map[string]interface{} `json:"variables,omitempty" yaml:"variables,omitempty"` // global variables
Parameters map[string]interface{} `json:"parameters,omitempty" yaml:"parameters,omitempty"`
ParametersSetting *TParamsConfig `json:"parameters_setting,omitempty" yaml:"parameters_setting,omitempty"`

14
hrp/runner.go
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
}

6
hrp/testcase.go
View File

@@ -91,11 +91,11 @@ func (path *TestCasePath) ToTestCase() (*TestCase, error) {
// override testcase config env with variables loaded from .env file
// priority: .env file > testcase config env
if testCase.Config.Env == nil {
testCase.Config.Env = make(map[string]string)
if testCase.Config.Environs == nil {
testCase.Config.Environs = make(map[string]string)
}
for key, value := range envVars {
testCase.Config.Env[key] = value
testCase.Config.Environs[key] = value
}
}