diff --git a/demo/sample/4_expect_saved_to_file.php b/demo/sample/4_expect_saved_to_file.php index b49ceab4e52d1682476ccf4536c5d14d16dae6aa..7f85870b572653c037ccff5f65eb804ba1d0efa9 100755 --- a/demo/sample/4_expect_saved_to_file.php +++ b/demo/sample/4_expect_saved_to_file.php @@ -7,6 +7,7 @@ cid=0 pid=0 1. step 1 >> + 2. step 2 3. step 3 diff --git a/demo/sample/_old2.php b/demo/sample/_old2.php index a15e44b56968a2f9daa7234acce42b5c05e0b6f0..a23dee1d9192f726b6689cb73dd3a11065659a60 100755 --- a/demo/sample/_old2.php +++ b/demo/sample/_old2.php @@ -15,18 +15,18 @@ pid=0 3.1 step 3.2 step >> expect 3 -[1. group title 1] - [1.1. steps] - step 1.1.1 - step 1.1.2 - [1.1. expects] - - [1.2. steps] - step 1.2.1 - step 1.2.2 - [1.2. expects] - expect 1.2.1 - expect 1.2.2 +[4. group title 1] + [4.1. steps] + step 4.1.1 + step 4.1.2 + [4.1. expects] + + [4.2. steps] + step 4.2.1 + step 4.2.2 + [4.2. expects] + expect 4.2.1 + expect 4.2.2 [esac] @@ -36,5 +36,5 @@ print(">>expect 1\n"); print(">>expect 3\n"); print(">>\n"); -print("expect 1.2.1\n"); -print("expect 1.2.2\n"); +print("expect 4.2.1\n"); +print("expect 4.2.2\n"); diff --git a/src/utils/script/script.go b/src/utils/script/script.go index 7309dce021475a61d171352b3ecb9e0f681c7bce..5ea6de6c80fd4be781c0cf06711c68b7b03e3dd1 100644 --- a/src/utils/script/script.go +++ b/src/utils/script/script.go @@ -141,7 +141,7 @@ func getStepNestedArrNew(lines []string) (ret []model.TestStep) { increase := 0 for index := 0; index < len(lines); index++ { line := lines[index] - if strings.TrimSpace(line) == "" { + if strings.TrimSpace(line) == "" || strings.TrimSpace(line) == ">>" || strings.TrimSpace(line) == "<<" { continue } diff --git a/src/utils/zentao/zentao.go b/src/utils/zentao/zentao.go index 60830065bf924f55696bc71ac5653eb621965eac..f908b80c35834773e258c6fe6679e245569c858e 100644 --- a/src/utils/zentao/zentao.go +++ b/src/utils/zentao/zentao.go @@ -324,7 +324,10 @@ func ReadLogArrNew(content string) (isSkip bool, ret [][]string) { ret = append(ret, temp) cpArr = make([]string, 0) + model = "" } + } else if line == "<<" { + continue } else { model = "single"