summaryrefslogtreecommitdiff
path: root/tests
diff options
context:
space:
mode:
authorBen Hutchings <ben.hutchings@codethink.co.uk>2020-09-17 00:25:27 +0100
committerBen Hutchings <ben.hutchings@codethink.co.uk>2020-09-17 01:36:33 +0100
commit37f629385d9acb49061700932c237c038433a2e3 (patch)
treefdc3bd0ce0d87affb11a151f4855e690a2790c62 /tests
parentdfd9a7d9ad8be7b467f2203ccaa7b3e8ccb91f4a (diff)
downloadlorry-37f629385d9acb49061700932c237c038433a2e3.tar.gz
tests: Do not hide lorry errors
Redirecting lorry's stderr to /dev/null just makes test failures harder to debug. Only do that when we expect it to fail.
Diffstat (limited to 'tests')
-rwxr-xr-xtests/bzr-single-commit.script2
-rwxr-xr-xtests/cvs-single-commit.script2
-rwxr-xr-xtests/extended-headers-ignored.script2
-rwxr-xr-xtests/git-single-commit.script2
-rwxr-xr-xtests/hg-incremental.script4
-rwxr-xr-xtests/hg-single-commit.script2
-rwxr-xr-xtests/hg-unnamed-head.script4
-rwxr-xr-xtests/make-tarball.script2
-rwxr-xr-xtests/svn-single-commit.script2
-rwxr-xr-xtests/tar-single-commit.script2
10 files changed, 12 insertions, 12 deletions
diff --git a/tests/bzr-single-commit.script b/tests/bzr-single-commit.script
index 80b9d99..0f7895e 100755
--- a/tests/bzr-single-commit.script
+++ b/tests/bzr-single-commit.script
@@ -25,7 +25,7 @@ logfile="$DATADIR/bzr-test-repo.log"
workdir="$DATADIR/work-dir"
"${SRCDIR}/test-lorry" --pull-only --log="$logfile" --working-area="$workdir" \
- "$DATADIR/bzr-test-repo.lorry" > /dev/null 2> /dev/null
+ "$DATADIR/bzr-test-repo.lorry" > /dev/null
# verify that the git repository was set up correctly
(
diff --git a/tests/cvs-single-commit.script b/tests/cvs-single-commit.script
index a0639ba..f7d551d 100755
--- a/tests/cvs-single-commit.script
+++ b/tests/cvs-single-commit.script
@@ -37,7 +37,7 @@ export LOGNAME=$USER
export USERNAME=$USER
"${SRCDIR}/test-lorry" --pull-only --log="$logfile" --working-area="$workdir" \
- "$DATADIR/cvs-test-repo.lorry" > /dev/null 2> /dev/null
+ "$DATADIR/cvs-test-repo.lorry" > /dev/null
# verify that the git repository was created successfully
(
diff --git a/tests/extended-headers-ignored.script b/tests/extended-headers-ignored.script
index dcc01fc..04ceacd 100755
--- a/tests/extended-headers-ignored.script
+++ b/tests/extended-headers-ignored.script
@@ -31,7 +31,7 @@ logfile="$DATADIR/extended-headers-ignored-test-repo.log"
workdir="$DATADIR/work-dir"
"${SRCDIR}/test-lorry" --pull-only --log="$logfile" --working-area="$workdir" \
- "$DATADIR/extended-headers-ignored-test.lorry" > /dev/null 2> /dev/null
+ "$DATADIR/extended-headers-ignored-test.lorry" > /dev/null
repodst="$DATADIR/extended-headers"
git clone "$workdir/extended-headers-test-repo/git-a" "$repodst" >/dev/null 2>&1
diff --git a/tests/git-single-commit.script b/tests/git-single-commit.script
index 9c4813e..80d117c 100755
--- a/tests/git-single-commit.script
+++ b/tests/git-single-commit.script
@@ -25,7 +25,7 @@ logfile="$DATADIR/git-test-repo.log"
workdir="$DATADIR/work-dir"
"${SRCDIR}/test-lorry" --pull-only --log="$logfile" --working-area="$workdir" \
- "$DATADIR/git-test-repo.lorry" > /dev/null 2> /dev/null
+ "$DATADIR/git-test-repo.lorry" > /dev/null
# verify that the git repository was set up correctly
(
diff --git a/tests/hg-incremental.script b/tests/hg-incremental.script
index 489efa7..b8ad73c 100755
--- a/tests/hg-incremental.script
+++ b/tests/hg-incremental.script
@@ -26,7 +26,7 @@ logfile="$DATADIR/hg-test-repo.log"
workdir="$DATADIR/work-dir"
"${SRCDIR}/test-lorry" --verbose --pull-only --log="$logfile" --working-area="$workdir" \
- "$DATADIR/hg-test-repo.lorry" > /dev/null 2> /dev/null
+ "$DATADIR/hg-test-repo.lorry" > /dev/null
# make a second commit
(
@@ -36,7 +36,7 @@ workdir="$DATADIR/work-dir"
)
"${SRCDIR}/test-lorry" --verbose --pull-only --log="$logfile" --working-area="$workdir" \
- "$DATADIR/hg-test-repo.lorry" > /dev/null 2> /dev/null
+ "$DATADIR/hg-test-repo.lorry" > /dev/null
# verify that the git repository was created correctly
(
diff --git a/tests/hg-single-commit.script b/tests/hg-single-commit.script
index 0b95dc9..6fc3ca1 100755
--- a/tests/hg-single-commit.script
+++ b/tests/hg-single-commit.script
@@ -25,7 +25,7 @@ logfile="$DATADIR/hg-test-repo.log"
workdir="$DATADIR/work-dir"
"${SRCDIR}/test-lorry" --verbose --pull-only --log="$logfile" --working-area="$workdir" \
- "$DATADIR/hg-test-repo.lorry" > /dev/null 2> /dev/null
+ "$DATADIR/hg-test-repo.lorry" > /dev/null
# verify that the git repository was created correctly
(
diff --git a/tests/hg-unnamed-head.script b/tests/hg-unnamed-head.script
index 1811645..d3047e4 100755
--- a/tests/hg-unnamed-head.script
+++ b/tests/hg-unnamed-head.script
@@ -25,7 +25,7 @@ logfile="$DATADIR/hg-test-repo.log"
workdir="$DATADIR/work-dir"
"${SRCDIR}/test-lorry" --verbose --pull-only --log="$logfile" --working-area="$workdir" \
- "$DATADIR/hg-test-repo.lorry" > /dev/null 2> /dev/null
+ "$DATADIR/hg-test-repo.lorry" > /dev/null
grep -o 'pruned [0-9]* unreachable commit' < "$logfile" || true
# verify that the git repository was created correctly
@@ -48,5 +48,5 @@ grep -o 'pruned [0-9]* unreachable commit' < "$logfile" || true
# check that we can another incremental conversion succeeds, and
# that this involves pruning an unreachable commit
"${SRCDIR}/test-lorry" --verbose --pull-only --log="$logfile" --working-area="$workdir" \
- "$DATADIR/hg-test-repo.lorry" > /dev/null 2> /dev/null
+ "$DATADIR/hg-test-repo.lorry" > /dev/null
grep -o 'pruned [0-9]* unreachable commit' < "$logfile"
diff --git a/tests/make-tarball.script b/tests/make-tarball.script
index 46618cd..3edecb2 100755
--- a/tests/make-tarball.script
+++ b/tests/make-tarball.script
@@ -25,7 +25,7 @@ workdir="$DATADIR/work-dir"
"${SRCDIR}/test-lorry" --pull-only --log="$logfile" --working-area="$workdir" \
--tarball=first --mirror-base-url-fetch="file://non-existent-url" \
- "$DATADIR/make-tarball-repo.lorry" > /dev/null 2> /dev/null
+ "$DATADIR/make-tarball-repo.lorry" > /dev/null
# verify that we can see the tarball generated of the git tree
diff --git a/tests/svn-single-commit.script b/tests/svn-single-commit.script
index 7ae2eb9..ff1cc70 100755
--- a/tests/svn-single-commit.script
+++ b/tests/svn-single-commit.script
@@ -33,7 +33,7 @@ normalize() {
}
"${SRCDIR}/test-lorry" --pull-only --log="$logfile" --working-area="$workdir" \
- "$DATADIR/svn-test-repo.lorry" > /dev/null 2> /dev/null
+ "$DATADIR/svn-test-repo.lorry" > /dev/null
# verify that the git repository was created successfully
(
diff --git a/tests/tar-single-commit.script b/tests/tar-single-commit.script
index 4d91417..3204a0c 100755
--- a/tests/tar-single-commit.script
+++ b/tests/tar-single-commit.script
@@ -24,7 +24,7 @@ logfile="$DATADIR/tar-single-commit.log"
workdir="$DATADIR/work-dir"
"${SRCDIR}/test-lorry" --pull-only --log="$logfile" --working-area="$workdir" \
- "$DATADIR/tar-test-repo.lorry" > /dev/null 2> /dev/null
+ "$DATADIR/tar-test-repo.lorry" > /dev/null
# verify that the git repositories were created successfully
for FORMAT in "gzip" "bzip2" "lzma"; do