Commit b90c30485ccda2a8a4950134cedef294b4e8e18e
2020-04-19T09:10:52
adjust expected "object not found" error output in tests
1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37
diff --git a/regress/cmdline/log.sh b/regress/cmdline/log.sh
index 6bde801..a92186b 100755
--- a/regress/cmdline/log.sh
+++ b/regress/cmdline/log.sh
@@ -442,8 +442,8 @@ function test_log_end_at_commit {
# try the same with the hash of an empty string which is very
# unlikely to match any object
- (cd $testroot/wt && \
- got log -x da39a3ee5e6b4b0d3255bfef95601890afd80709 \
+ local empty_sha1=da39a3ee5e6b4b0d3255bfef95601890afd80709
+ (cd $testroot/wt && got log -x $empty_sha1 \
> $testroot/stdout 2> $testroot/stderr)
ret="$?"
if [ "$ret" == "0" ]; then
@@ -452,7 +452,7 @@ function test_log_end_at_commit {
return 1
fi
echo -n > $testroot/stdout.expected
- echo "got: object not found" > $testroot/stderr.expected
+ echo "got: $empty_sha1: object not found" > $testroot/stderr.expected
cmp -s $testroot/stderr.expected $testroot/stderr
ret="$?"
if [ "$ret" != "0" ]; then
diff --git a/regress/cmdline/tag.sh b/regress/cmdline/tag.sh
index fb5ed4e..ca67103 100755
--- a/regress/cmdline/tag.sh
+++ b/regress/cmdline/tag.sh
@@ -97,7 +97,7 @@ function test_tag_create {
return 1
fi
- echo "got: object not found" > $testroot/stderr.expected
+ echo "got: $tree_id: object not found" > $testroot/stderr.expected
cmp -s $testroot/stderr $testroot/stderr.expected
ret="$?"
if [ "$ret" != "0" ]; then