From 94e10ec190113f10202257fc33bc6cc6a0c7a390 Mon Sep 17 00:00:00 2001 From: aaron <462826@qq.com> Date: Thu, 30 Jul 2020 14:07:57 +0800 Subject: [PATCH] fix a issue --- demo/sample/1_simple.php | 4 ++-- src/service/testing/ztfCheck.go | 1 + 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/demo/sample/1_simple.php b/demo/sample/1_simple.php index ac616b6e..8d2b7b59 100755 --- a/demo/sample/1_simple.php +++ b/demo/sample/1_simple.php @@ -7,14 +7,14 @@ cid=0 pid=0 [group] - 1. step1 >> expect 1 + 1. step1 >> expect好 1 2. step2 3. step3 >> expect 3 [esac] */ -checkStep1() || print(">> - expect 1\n"); +checkStep1() || print(">> - expect好 1\n"); checkStep3() || print(">> expect 3\n"); function checkStep1(){} diff --git a/src/service/testing/ztfCheck.go b/src/service/testing/ztfCheck.go index 53893d0f..c3a7c6c3 100644 --- a/src/service/testing/ztfCheck.go +++ b/src/service/testing/ztfCheck.go @@ -113,6 +113,7 @@ func ValidateStepResult(langType string, expectLines []string, actualLines []str log = actualLines[indx2] } + expect = strings.TrimSpace(expect) var pass bool if expect[:1] == "`" && expect[len(expect) - 1:] == "`" { expect = expect[1:len(expect) - 1] -- GitLab