mirror of
https://github.com/mnauw/git-remote-hg.git
synced 2025-11-15 15:35:49 +01:00
test: properly check for mercurial
We want to fail if it's not present, not skip the tests. Signed-off-by: Felipe Contreras <felipe.contreras@gmail.com>
This commit is contained in:
@@ -10,12 +10,6 @@ test_description='Test bidirectionality of remote-hg'
|
||||
|
||||
. ./test-lib.sh
|
||||
|
||||
if ! python -c 'import mercurial' > /dev/null 2>&1
|
||||
then
|
||||
skip_all='skipping remote-hg tests; mercurial not available'
|
||||
test_done
|
||||
fi
|
||||
|
||||
# clone to a git repo
|
||||
git_clone () {
|
||||
git clone -q "hg::$1" $2
|
||||
|
||||
@@ -14,12 +14,6 @@ test_description='Test remote-hg output compared to hg-git'
|
||||
|
||||
export EXPECTED_DIR="$SHARNESS_TEST_DIRECTORY/expected"
|
||||
|
||||
if ! python -c 'import mercurial' > /dev/null 2>&1
|
||||
then
|
||||
skip_all='skipping remote-hg tests; mercurial not available'
|
||||
test_done
|
||||
fi
|
||||
|
||||
git_clone () {
|
||||
git clone -q "hg::$1" $2 &&
|
||||
(
|
||||
|
||||
@@ -10,12 +10,6 @@ test_description='Test remote-hg'
|
||||
|
||||
. ./test-lib.sh
|
||||
|
||||
if ! python -c 'import mercurial' > /dev/null 2>&1
|
||||
then
|
||||
skip_all='skipping remote-hg tests; mercurial not available'
|
||||
test_done
|
||||
fi
|
||||
|
||||
check () {
|
||||
echo $3 > expected &&
|
||||
git --git-dir=$1/.git log --format='%s' -1 $2 > actual &&
|
||||
|
||||
@@ -3,6 +3,11 @@
|
||||
: "${SHARNESS_TEST_SRCDIR:=$(cd "$(dirname "${BASH_SOURCE-$0}")" && pwd)}"
|
||||
. "$SHARNESS_TEST_SRCDIR"/sharness.sh
|
||||
|
||||
if ! python -c 'import mercurial' > /dev/null 2>&1
|
||||
then
|
||||
error 'mercurial not available'
|
||||
fi
|
||||
|
||||
GIT_AUTHOR_EMAIL=author@example.com
|
||||
GIT_AUTHOR_NAME='A U Thor'
|
||||
GIT_COMMITTER_EMAIL=committer@example.com
|
||||
|
||||
Reference in New Issue
Block a user