HDDS-1937. Acceptance tests fail if scm webui shows invalid json

elek · elek · commit defa4d9b264f · 2019-08-24T21:19:43.000+02:00
diff --git a/hadoop-ozone/dist/src/main/compose/testlib.sh b/hadoop-ozone/dist/src/main/compose/testlib.sh
@@ -39,7 +39,7 @@ count_datanodes() {
   else
     docker-compose -f "${compose_file}" exec -T scm curl -s "${jmx_url}"
   fi \
-    | jq -r '.beans[0].NodeCount[] | select(.key=="HEALTHY") | .value'
+    | jq -r '.beans[0].NodeCount[] | select(.key=="HEALTHY") | .value' || true
 }
 
 ## @description wait until datanodes are up (or 30 seconds)

Original file line number	Diff line number	Diff line change
`@@ -39,7 +39,7 @@ count_datanodes() {`
`39`	`39`	`else`
`40`	`40`	`docker-compose -f "${compose_file}" exec -T scm curl -s "${jmx_url}"`
`41`	`41`	`fi \`
`42`		`- \| jq -r '.beans[0].NodeCount[] \| select(.key=="HEALTHY") \| .value'`
	`42`	`+ \| jq -r '.beans[0].NodeCount[] \| select(.key=="HEALTHY") \| .value' \|\| true`
`43`	`43`	`}`
`44`	`44`
`45`	`45`	`## @description wait until datanodes are up (or 30 seconds)`