Nemcio/git-remote-hg
1
0
Fork 0
mirror of https://github.com/mnauw/git-remote-hg.git synced 2025-11-15 23:45:49 +01:00
Code Issues Packages Projects Releases Activity

test: properly check for mercurial

Browse Source 
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:
Felipe Contreras
2023-03-06 09:22:03 -06:00
parent a1e2c4acc9
commit 5e6ef0a1d5
4 changed files with 5 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
test/bidi.t
View File

@@ -10,12 +10,6 @@ test_description='Test bidirectionality of remote-hg'
. ./test-lib.sh . ./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 # clone to a git repo
git_clone () { git_clone () {
git clone -q "hg::$1" $2 git clone -q "hg::$1" $2

6
test/hg-git.t
View File

@@ -14,12 +14,6 @@ test_description='Test remote-hg output compared to hg-git'
export EXPECTED_DIR="$SHARNESS_TEST_DIRECTORY/expected" 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 () {
git clone -q "hg::$1" $2 && git clone -q "hg::$1" $2 &&
( (

6
test/main.t
View File

@@ -10,12 +10,6 @@ test_description='Test remote-hg'
. ./test-lib.sh . ./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 () { check () {
echo $3 > expected && echo $3 > expected &&
git --git-dir=$1/.git log --format='%s' -1 $2 > actual && git --git-dir=$1/.git log --format='%s' -1 $2 > actual &&

5
test/test-lib.sh
View File

@@ -3,6 +3,11 @@
: "${SHARNESS_TEST_SRCDIR:=$(cd "$(dirname "${BASH_SOURCE-$0}")" && pwd)}" : "${SHARNESS_TEST_SRCDIR:=$(cd "$(dirname "${BASH_SOURCE-$0}")" && pwd)}"
. "$SHARNESS_TEST_SRCDIR"/sharness.sh . "$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_EMAIL=author@example.com
GIT_AUTHOR_NAME='A U Thor' GIT_AUTHOR_NAME='A U Thor'
GIT_COMMITTER_EMAIL=committer@example.com GIT_COMMITTER_EMAIL=committer@example.com