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

test: use generic python reference rather than python2

Browse Source
This commit is contained in:
Mark Nauwelaerts
2020-06-12 13:11:17 +02:00
parent dc91c58e1c
commit 28ed63b707
5 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
test/bidi.t
View File

@@ -17,7 +17,7 @@ then
test_done test_done
fi fi
if ! python2 -c 'import mercurial' > /dev/null 2>&1 if ! python -c 'import mercurial' > /dev/null 2>&1
then then
skip_all='skipping remote-hg tests; mercurial not available' skip_all='skipping remote-hg tests; mercurial not available'
test_done test_done

2
test/helper.t
View File

@@ -17,7 +17,7 @@ then
test_done test_done
fi fi
if ! python2 -c 'import mercurial' > /dev/null 2>&1 if ! python -c 'import mercurial' > /dev/null 2>&1
then then
skip_all='skipping remote-hg tests; mercurial not available' skip_all='skipping remote-hg tests; mercurial not available'
test_done test_done

6
test/hg-git.t
View File

@@ -17,16 +17,16 @@ then
test_done test_done
fi fi
if ! python2 -c 'import mercurial' > /dev/null 2>&1 if ! python -c 'import mercurial' > /dev/null 2>&1
then then
skip_all='skipping remote-hg tests; mercurial not available' skip_all='skipping remote-hg tests; mercurial not available'
test_done test_done
fi fi
if python2 -c 'import hggit' > /dev/null 2>&1 if python -c 'import hggit' > /dev/null 2>&1
then then
hggit=hggit hggit=hggit
elif python2 -c 'import hgext.git' > /dev/null 2>&1 elif python -c 'import hgext.git' > /dev/null 2>&1
then then
hggit=hgext.git hggit=hgext.git
else else

2
test/main.t
View File

@@ -26,7 +26,7 @@ then
test_done test_done
fi fi
if ! python2 -c 'import mercurial' > /dev/null 2>&1 if ! python -c 'import mercurial' > /dev/null 2>&1
then then
skip_all='skipping remote-hg tests; mercurial not available' skip_all='skipping remote-hg tests; mercurial not available'
test_done test_done

2
tools/check-versions
View File

@@ -102,7 +102,7 @@ class Component
def build def build
Dir.chdir(dir) do Dir.chdir(dir) do
targets = %w[build_py build_ext].map { |e| [e, '--build-lib', "#{$builddir}/python"] } targets = %w[build_py build_ext].map { |e| [e, '--build-lib', "#{$builddir}/python"] }
run_cmd %w[python2 setup.py --quiet] + targets.flatten run_cmd %w[python setup.py --quiet] + targets.flatten
end end
end end