Merge pull request #2572 from dongluochen/fix-version-validation

Fix api_version test
docker-archive · Dec 21, 2016 · 87c150b · 87c150b
2 parents fecbcff + d7b9ff5
commit 87c150b
Showing 1 changed file with 4 additions and 4 deletions.
diff --git a/test/integration/api_version.bats b/test/integration/api_version.bats
@@ -17,15 +17,15 @@ function teardown() {
 	out=$(docker -H "${HOSTS[0]}" version)	
 
 	# Check client version
-	run bash -c "echo '$out' | grep -i version | grep -v Go | grep -v API | grep -v Minimum"
+	run bash -c "echo '$out' | egrep -i '^\s*Version'"
 	[ "$status" -eq 0 ]
 
-	[[ $(echo "${lines[0]}" | cut -d':' -f2 | tr -d '[:space:]') == $(echo "${lines[1]}" | cut -d':' -f2 | tr -d '[:space:]') ]]
+	[[ $(echo "${lines[0]}" | cut -d':' -f2 | awk -F' ' '{print $1}')  == $(echo "${lines[1]}" | cut -d':' -f2 | awk -F' ' '{print $1}') ]]
 
 	# Check API version
-	run bash -c "echo '$out' | grep -i version | grep -v Minimum | grep API"
+	run bash -c "echo '$out' | egrep -i '^\s*API version:'"
 	[ "$status" -eq 0 ]
 
-	[[ $(echo "${lines[0]}" | cut -d':' -f2 | tr -d '[:space:]') == $(echo "${lines[1]}" | cut -d':' -f2 | tr -d '[:space:]') ]]
+	[[ $(echo "${lines[0]}" | cut -d':' -f2 | awk -F' ' '{print $1}')  == $(echo "${lines[1]}" | cut -d':' -f2 | awk -F' ' '{print $1}') ]]
 
 }