TST On Python 3 --version comes out in STDERR so test that too

Bicko · Feb 10, 2017 · 5d3ade8 · 5d3ade8
1 parent e7394ce
commit 5d3ade8
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 4 deletions.
diff --git a/tests/bash_tap_fd.sh b/tests/bash_tap_fd.sh
@@ -33,7 +33,7 @@ function skip_if_not_git {
 }
 
 function get_internal_version {
-    echo -e "grep . ${bashtap_org_pwd}/../CHANGELOG.md | head -n 1 | cut -d ' ' -f 2"
+    echo -e "$(grep '\.' ${bashtap_org_pwd}/../CHANGELOG.md | head -n 1 | cut -d ' ' -f 2)"
 }
 
 # Cut out the first two fields, from log as they are date and time (which would make it impossible to test ;D)

diff --git a/tests/version.t b/tests/version.t
@@ -3,9 +3,11 @@
 
 CMD=$(get_script)
 GIT_VERSION="git describe --tags"
-EXPECTED_VERSION=$(get_internal_version)
+EXPECTED_VERSION="get_internal_version"
 
-skip_if_not_git || diff -u <(${CMD} --version || kill $$) <($GIT_VERSION)
-diff -u <(cd / && ${CMD} --version || kill $$) <($EXPECTED_VERSION)
+[ "x${GIT_VERSION}" != "x" ]
+[ "x${EXPECTED_VERSION}" != "x" ]
+skip_if_not_git || diff -u <(${CMD} --version 2>&1  || kill $$) <($GIT_VERSION)
+diff -u <(cd / && ${CMD} --version 2>&1 || kill $$) <($EXPECTED_VERSION)
 
 # vim: ai sts=4 et sw=4