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

refactor: simplify ITestCase

Browse Source
This commit is contained in:
debugtalk
2022-03-28 20:36:35 +08:00
parent 1e91b8cb0f
commit f5e80989c4
4 changed files with 88 additions and 111 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
hrp/runner.go
View File

@@ -230,9 +230,14 @@ func loadTestCases(iTestCases ...ITestCase) ([]*TestCase, error) {
// folder path
files, err := ioutil.ReadDir(casePath)
if err != nil {
return nil, errors.Wrap(err, "failed to read dir")
return nil, errors.Wrap(err, "read dir failed")
}
for _, f := range files {
ext := filepath.Ext(f.Name())
if ext != ".yml" && ext != ".yaml" && ext != ".json" {
// ignore non-testcase files
continue
}
path := TestCasePath(filepath.Join(casePath, f.Name()))
casePaths = append(casePaths, &path)
}
@@ -244,7 +249,8 @@ func loadTestCases(iTestCases ...ITestCase) ([]*TestCase, error) {
for _, path := range casePaths {
tc, err := path.ToTestCase()
if err != nil {
continue
log.Error().Err(err).Str("path", path.GetPath()).Msg("load testcase failed")
return nil, errors.Wrap(err, "load testcase failed")
}
testCases = append(testCases, tc)
}
@@ -561,7 +567,7 @@ func (r *caseRunner) runStepRendezvous(rendezvous *Rendezvous) (stepResult *step
}
func (r *caseRunner) isPreRendezvousAllReleased(rendezvous *Rendezvous) bool {
tCase, _ := r.ToTCase()
tCase := convertTestCase(r.TestCase)
for _, step := range tCase.TestSteps {
preRendezvous := step.Rendezvous
if preRendezvous == nil {
@@ -608,7 +614,7 @@ func (r *Rendezvous) setReleased() {
}
func initRendezvous(testcase *TestCase, total int64) []*Rendezvous {
tCase, _ := testcase.ToTCase()
tCase := convertTestCase(testcase)
var rendezvousList []*Rendezvous
for _, step := range tCase.TestSteps {
if step.Rendezvous == nil {