Merge pull request #220 from emqx/develop

Additional contents for 0.3.1
lf-edge · Apr 16, 2020 · 1a3043a · 1a3043a
2 parents 6ba25b3 + aa137b1
commit 1a3043a
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 3 deletions.
diff --git a/.github/workflows/run_fvt_tests.yaml b/.github/workflows/run_fvt_tests.yaml
@@ -64,7 +64,8 @@ jobs:
           run: |
             sudo apt update && sudo apt install -y libxml2-utils
             cd jmeter_logs
-            if [ "$(xmllint --format --xpath '/testResults/sample/@rc' $(ls *.jtl) | sed -r 's/ /\n/g;' | sort -u | grep -E 'rc=\"[45][0-9][0-9]\"|rc=\"\"')" != "" ]; then
+            if [ ! -z "$(cat *.jtl| grep '<failure>' | awk -F '>' '{print $2}' | awk -F '<' '{print $1}' | grep true)" ] ||
+               [ "$(xmllint --format --xpath '/testResults/sample/@rc' $(ls *.jtl) | sed -r 's/ /\n/g;' | sort -u | grep -E 'rc=\"[45][0-9][0-9]\"|rc=\"\"')" != "" ]; then
                 echo -e "---------------------------------------------\n"
                 echo "FVT tests error"
                 exit 1
@@ -125,7 +126,8 @@ jobs:
           run: |
             sudo apt update && sudo apt install -y libxml2-utils
             cd jmeter_logs
-            if [ "$(xmllint --format --xpath '/testResults/sample/@rc' $(ls *.jtl) | sed -r 's/ /\n/g;' | sort -u | grep -E 'rc=\"[45][0-9][0-9]\"|rc=\"\"')" != "" ]; then
+            if [ ! -z "$(cat *.jtl| grep '<failure>' | awk -F '>' '{print $2}' | awk -F '<' '{print $1}' | grep true)" ] ||
+               [ "$(xmllint --format --xpath '/testResults/sample/@rc' $(ls *.jtl) | sed -r 's/ /\n/g;' | sort -u | grep -E 'rc=\"[45][0-9][0-9]\"|rc=\"\"')" != "" ]; then
                 echo -e "---------------------------------------------\n"
                 echo "FVT tests error"
                 exit 1
@@ -246,7 +248,8 @@ jobs:
         run: |
           sudo apt update && sudo apt install -y libxml2-utils
           cd jmeter_logs
-          if [ "$(xmllint --format --xpath '/testResults/sample/@rc' $(ls *.jtl) | sed -r 's/ /\n/g;' | sort -u | grep -E 'rc=\"[45][0-9][0-9]\"|rc=\"\"')" != "" ]; then
+          if [ ! -z "$(cat *.jtl| grep '<failure>' | awk -F '>' '{print $2}' | awk -F '<' '{print $1}' | grep true)" ] ||
+             [ "$(xmllint --format --xpath '/testResults/sample/@rc' $(ls *.jtl) | sed -r 's/ /\n/g;' | sort -u | grep -E 'rc=\"[45][0-9][0-9]\"|rc=\"\"')" != "" ]; then
               echo -e "---------------------------------------------\n"
               echo "FVT tests error"
               exit 1

diff --git a/xstream/extensions/edgex_source.go b/xstream/extensions/edgex_source.go
@@ -192,6 +192,8 @@ func (es *EdgexSource) getValue(r models.Reading, logger api.Logger) (interface{
 		}
 	case "STRING":
 		return v, nil
+	case "BINARY":
+		return nil, fmt.Errorf("Unsupport for binary type, the value will be ignored.")
 	default:
 		logger.Warnf("unknown type %s return the string value", t)
 		return v, nil