GithubBackup/httprunner
1
0
Fork 0
mirror of https://github.com/httprunner/httprunner.git synced 2026-05-13 17:29:56 +08:00
Code Issues Packages Projects Releases Wiki Activity

feat: runStepRequest

Browse Source
This commit is contained in:
debugtalk
2021-09-24 11:24:13 +08:00
parent e1f723e47e
commit a2ca1cd0dd
3 changed files with 26 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
boomer.go
View File

@@ -37,8 +37,7 @@ func convertBoomerTask(testcase *TestCase) *boomer.Task {
config := &testcase.Config
for _, step := range testcase.TestSteps {
start := time.Now()
tStep := parseStep(step, config)
err := runner.runStep(tStep)
err := runner.runStep(step, config)
elapsed := time.Since(start).Nanoseconds() / int64(time.Millisecond)
if err == nil {

40
runner.go
View File

@@ -36,25 +36,32 @@ func (r *Runner) runCase(testcase *TestCase) error {
config := &testcase.Config
log.Printf("Start to run testcase: %v", config.Name)
for _, step := range testcase.TestSteps {
if tc, ok := step.(*testcaseWithOptionalArgs); ok {
// run referenced testcase
log.Printf("run referenced testcase: %v", tc.step.Name)
if err := r.runCase(tc.step.TestCase); err != nil {
return err
}
} else {
// run request
tStep := parseStep(step, config)
if err := r.runStep(tStep); err != nil {
return err
}
}
r.runStep(step, config)
}
return nil
}
func (r *Runner) runStep(step *TStep) error {
log.Printf("run step begin: %v >>>>>>", step.Name)
func (r *Runner) runStep(step IStep, config *TConfig) error {
log.Printf("run step begin: %v >>>>>>", step.Name())
if tc, ok := step.(*testcaseWithOptionalArgs); ok {
// run referenced testcase
log.Printf("run referenced testcase: %v", tc.step.Name)
// TODO: override testcase config
if err := r.runCase(tc.step.TestCase); err != nil {
return err
}
} else {
// run request
tStep := parseStep(step, config)
if err := r.runStepRequest(tStep); err != nil {
return err
}
}
log.Printf("run step end: %v <<<<<<\n", step.Name())
return nil
}
func (r *Runner) runStepRequest(step *TStep) error {
var v []interface{}
v = append(v, req.Header(step.Request.Headers))
v = append(v, req.Param(step.Request.Params))
@@ -73,8 +80,7 @@ func (r *Runner) runStep(step *TStep) error {
if err != nil {
return err
}
resp.Response().Body.Close()
log.Printf("run step end: %v <<<<<<\n", step.Name)
defer resp.Response().Body.Close()
return nil
}

4
step_test.go
View File

@@ -73,10 +73,10 @@ func TestRunRequestRun(t *testing.T) {
config := &TConfig{
BaseURL: "https://postman-echo.com",
}
if err := defaultRunner.runStep(parseStep(stepGET, config)); err != nil {
if err := defaultRunner.runStep(stepGET, config); err != nil {
t.Fatalf("tStep.Run() error: %s", err)
}
if err := defaultRunner.runStep(parseStep(stepPOSTData, config)); err != nil {
if err := defaultRunner.runStep(stepPOSTData, config); err != nil {
t.Fatalf("tStepPOSTData.Run() error: %s", err)
}
}