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

change: add session variables

Browse Source
This commit is contained in:
debugtalk
2021-11-15 15:12:21 +08:00
parent 2104019d28
commit ddd162f349
3 changed files with 13 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
boomer.go
View File

@@ -43,11 +43,10 @@ func (b *Boomer) convertBoomerTask(testcase *TestCase) *boomer.Task {
Weight: testcase.Config.Weight, Weight: testcase.Config.Weight,
Fn: func() { Fn: func() {
config := &testcase.Config config := &testcase.Config
extractedVariables := make(map[string]interface{})
for _, step := range testcase.TestSteps { for _, step := range testcase.TestSteps {
var err error var err error
start := time.Now() start := time.Now()
stepData, err := runner.runStep(step, config, extractedVariables) stepData, err := runner.runStep(step, config)
elapsed := time.Since(start).Nanoseconds() / int64(time.Millisecond) elapsed := time.Since(start).Nanoseconds() / int64(time.Millisecond)
if err == nil { if err == nil {
boomer.RecordSuccess(step.Type(), step.Name(), elapsed, stepData.ResponseLength) boomer.RecordSuccess(step.Type(), step.Name(), elapsed, stepData.ResponseLength)

20
runner.go
View File

@@ -36,13 +36,15 @@ func NewRunner(t *testing.T) *Runner {
}, },
Timeout: 30 * time.Second, Timeout: 30 * time.Second,
}, },
sessionVariables: make(map[string]interface{}),
} }
} }
type Runner struct { type Runner struct {
t *testing.T t *testing.T
debug bool debug bool
client *http.Client client *http.Client
sessionVariables map[string]interface{}
} }
func (r *Runner) SetDebug(debug bool) *Runner { func (r *Runner) SetDebug(debug bool) *Runner {
@@ -88,10 +90,8 @@ func (r *Runner) runCase(testcase *TestCase) error {
log.Info().Str("testcase", config.Name).Msg("run testcase start") log.Info().Str("testcase", config.Name).Msg("run testcase start")
extractedVariables := make(map[string]interface{})
for _, step := range testcase.TestSteps { for _, step := range testcase.TestSteps {
_, err := r.runStep(step, config, extractedVariables) _, err := r.runStep(step, config)
if err != nil { if err != nil {
return err return err
} }
@@ -101,12 +101,12 @@ func (r *Runner) runCase(testcase *TestCase) error {
return nil return nil
} }
func (r *Runner) runStep(step IStep, config *TConfig, extractedVariables map[string]interface{}) (stepData *StepData, err error) { func (r *Runner) runStep(step IStep, config *TConfig) (stepData *StepData, err error) {
log.Info().Str("step", step.Name()).Msg("run step start") log.Info().Str("step", step.Name()).Msg("run step start")
// override variables // override variables
// step variables > extracted variables from previous steps // step variables > session variables (extracted variables from previous steps)
stepVariables := mergeVariables(step.ToStruct().Variables, extractedVariables) stepVariables := mergeVariables(step.ToStruct().Variables, r.sessionVariables)
// step variables > testcase config variables // step variables > testcase config variables
stepVariables = mergeVariables(stepVariables, config.Variables) stepVariables = mergeVariables(stepVariables, config.Variables)
@@ -139,7 +139,7 @@ func (r *Runner) runStep(step IStep, config *TConfig, extractedVariables map[str
// update extracted variables // update extracted variables
for k, v := range stepData.ExportVars { for k, v := range stepData.ExportVars {
extractedVariables[k] = v r.sessionVariables[k] = v
} }
log.Info(). log.Info().

5
step_test.go
View File

@@ -77,12 +77,11 @@ func TestRunRequestRun(t *testing.T) {
config := &TConfig{ config := &TConfig{
BaseURL: "https://postman-echo.com", BaseURL: "https://postman-echo.com",
} }
extractedVariables := make(map[string]interface{})
runner := NewRunner(t).SetDebug(true) runner := NewRunner(t).SetDebug(true)
if _, err := runner.runStep(stepGET, config, extractedVariables); err != nil { if _, err := runner.runStep(stepGET, config); err != nil {
t.Fatalf("tStep.Run() error: %s", err) t.Fatalf("tStep.Run() error: %s", err)
} }
if _, err := runner.runStep(stepPOSTData, config, extractedVariables); err != nil { if _, err := runner.runStep(stepPOSTData, config); err != nil {
t.Fatalf("tStepPOSTData.Run() error: %s", err) t.Fatalf("tStepPOSTData.Run() error: %s", err)
} }
} }