When the python modules are not present we get an unwanted message:
*** prove ***
test-bzr.sh .. Traceback (most recent call last):
File "<string>", line 1, in <module>
File "/usr/local/buildtools/current/sitecustomize/sitecu...
return real_import(name, globals, locals, fromlist, level)
ImportError: No module named bzrlib
test-bzr.sh .. skipped: skipping remote-bzr tests; bzr not available
Files=1, Tests=0, 0 wallclock secs ( 0.03 usr 0.00 sys + 0.02 ...
Squelch that output.
Signed-off-by: Felipe Contreras <[email protected]>
---
contrib/remote-helpers/test-bzr.sh | 2 +-
contrib/remote-helpers/test-hg-bidi.sh | 2 +-
contrib/remote-helpers/test-hg-hg-git.sh | 4 ++--
contrib/remote-helpers/test-hg.sh | 2 +-
4 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/contrib/remote-helpers/test-bzr.sh
b/contrib/remote-helpers/test-bzr.sh
index a4656ce..932fe8a 100755
--- a/contrib/remote-helpers/test-bzr.sh
+++ b/contrib/remote-helpers/test-bzr.sh
@@ -14,7 +14,7 @@ then
test_done
fi
-if ! python -c 'import bzrlib'
+if ! python -c 'import bzrlib' > /dev/null 2>&1
then
skip_all='skipping remote-bzr tests; bzr not available'
test_done
diff --git a/contrib/remote-helpers/test-hg-bidi.sh
b/contrib/remote-helpers/test-hg-bidi.sh
index d86e147..2b5aa9d 100755
--- a/contrib/remote-helpers/test-hg-bidi.sh
+++ b/contrib/remote-helpers/test-hg-bidi.sh
@@ -17,7 +17,7 @@ then
test_done
fi
-if ! python -c 'import mercurial'
+if ! python -c 'import mercurial' > /dev/null 2>&1
then
skip_all='skipping remote-hg tests; mercurial not available'
test_done
diff --git a/contrib/remote-helpers/test-hg-hg-git.sh
b/contrib/remote-helpers/test-hg-hg-git.sh
index b23909a..456a07f 100755
--- a/contrib/remote-helpers/test-hg-hg-git.sh
+++ b/contrib/remote-helpers/test-hg-hg-git.sh
@@ -17,13 +17,13 @@ then
test_done
fi
-if ! python -c 'import mercurial'
+if ! python -c 'import mercurial' > /dev/null 2>&1
then
skip_all='skipping remote-hg tests; mercurial not available'
test_done
fi
-if ! python -c 'import hggit'
+if ! python -c 'import hggit' > /dev/null 2>&1
then
skip_all='skipping remote-hg tests; hg-git not available'
test_done
diff --git a/contrib/remote-helpers/test-hg.sh
b/contrib/remote-helpers/test-hg.sh
index 7d90056..056940a 100755
--- a/contrib/remote-helpers/test-hg.sh
+++ b/contrib/remote-helpers/test-hg.sh
@@ -17,7 +17,7 @@ then
test_done
fi
-if ! python -c 'import mercurial'
+if ! python -c 'import mercurial' > /dev/null 2>&1
then
skip_all='skipping remote-hg tests; mercurial not available'
test_done
--
1.9.2+fc1.1.g5c924db
--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to [email protected]
More majordomo info at http://vger.kernel.org/majordomo-info.html
