diff options
Diffstat (limited to 'tests.merging')
| -rwxr-xr-x | tests.merging/conflict-chunks.script | 4 | ||||
| -rwxr-xr-x | tests.merging/move-chunk-repo.script | 2 | ||||
| -rwxr-xr-x | tests.merging/rename-stratum.script | 2 |
3 files changed, 4 insertions, 4 deletions
diff --git a/tests.merging/conflict-chunks.script b/tests.merging/conflict-chunks.script index 98efcc3e..3c5ecb04 100755 --- a/tests.merging/conflict-chunks.script +++ b/tests.merging/conflict-chunks.script @@ -22,8 +22,8 @@ set -eu # Disable test on versions of Python before 2.7. if ! python --version 2>&1 | grep '^Python 2\.[78]' > /dev/null then - cat "$SRCDIR/tests.branching/merge-conflict-chunks.stdout" - cat "$SRCDIR/tests.branching/merge-conflict-chunks.stderr" >&2 + cat "$SRCDIR/tests.merging/conflict-chunks.stdout" + cat "$SRCDIR/tests.merging/conflict-chunks.stderr" >&2 exit 0 fi diff --git a/tests.merging/move-chunk-repo.script b/tests.merging/move-chunk-repo.script index d14d586f..d2a59349 100755 --- a/tests.merging/move-chunk-repo.script +++ b/tests.merging/move-chunk-repo.script @@ -22,7 +22,7 @@ set -eu # Disable test on versions of Python before 2.7. if ! python --version 2>&1 | grep '^Python 2\.[78]' > /dev/null then - cat "$SRCDIR/tests.branching/merge-with-chunk-repo-moved.stderr" >&2 + cat "$SRCDIR/tests.merging/move-chunk-repo.stderr" >&2 exit 1 fi diff --git a/tests.merging/rename-stratum.script b/tests.merging/rename-stratum.script index 6daac566..a7ba8699 100755 --- a/tests.merging/rename-stratum.script +++ b/tests.merging/rename-stratum.script @@ -22,7 +22,7 @@ set -eu # Disable test on versions of Python before 2.7. if ! python --version 2>&1 | grep '^Python 2\.[78]' > /dev/null then - cat "$SRCDIR/tests.branching/merge-with-stratum-renamed.stderr" 1>&2 + cat "$SRCDIR/tests.merging/rename-stratum.stderr" 1>&2 exit 1 fi |