Skip to content

Commit

Permalink
Fix remaining t/svn-conflicts tests to work with svn 1.10.7
Browse files Browse the repository at this point in the history
Use Trac 1.2 with Ubuntu 16.04 (1.4 not working)
  • Loading branch information
dpmatthews committed May 18, 2021
1 parent 4c9ca72 commit 010d415
Show file tree
Hide file tree
Showing 7 changed files with 25 additions and 16 deletions.
3 changes: 2 additions & 1 deletion .github/workflows/tests.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,8 @@ jobs:
libdbd-sqlite3-perl \
python-subversion libsvn-perl \
s-nail
[[ ${{matrix.ubuntu}} != "ubuntu-20.04" ]] && sudo pip install 'trac' || true
[[ ${{matrix.ubuntu}} == "ubuntu-16.04" ]] && sudo pip install 'trac==1.2' || true
[[ ${{matrix.ubuntu}} == "ubuntu-18.04" ]] && sudo pip install 'trac' || true
echo "#!/bin/bash" >"${PWD}/bin/gfortran"
echo 'exec gfortran-9 "$@"' >>"${PWD}/bin/gfortran"
chmod +x "${PWD}/bin/gfortran"
Expand Down
5 changes: 3 additions & 2 deletions t/fcm-conflicts/00-tree-add-add.t
Original file line number Diff line number Diff line change
Expand Up @@ -48,14 +48,15 @@ fcm merge --non-interactive $ROOT_URL/branches/dev/Share/add_add >/dev/null
run_pass "$TEST_KEY" fcm conflicts <<__IN__
n
__IN__
file_cmp "$TEST_KEY.out" "$TEST_KEY.out" <<__OUT__
file_cmp_filtered "$TEST_KEY.out" "$TEST_KEY.out" <<__OUT__
[info] new_file: in tree conflict.
Locally: added.
Externally: added.
Answer (y) to keep the local file filename.
Answer (n) to keep the external file filename.
Keep the local version?
Enter "y" or "n" (or just press <return> for "n") Resolved conflicted state of 'new_file'
#IF SVN1.8/9 Enter "y" or "n" (or just press <return> for "n") Resolved conflicted state of 'new_file'
#IF SVN1.10 Enter "y" or "n" (or just press <return> for "n") Tree conflict at 'new_file' marked as resolved.
__OUT__
file_cmp "$TEST_KEY.err" "$TEST_KEY.err" </dev/null
#-------------------------------------------------------------------------------
Expand Down
5 changes: 3 additions & 2 deletions t/fcm-conflicts/03-tree-delete-rename.t
Original file line number Diff line number Diff line change
Expand Up @@ -91,15 +91,16 @@ fcm merge --non-interactive $ROOT_URL/branches/dev/Share/del_ren >/dev/null
run_pass "$TEST_KEY" fcm conflicts <<__IN__
y
__IN__
file_cmp "$TEST_KEY.out" "$TEST_KEY.out" <<__OUT__
file_cmp_filtered "$TEST_KEY.out" "$TEST_KEY.out" <<__OUT__
[info] pro/hello.pro: in tree conflict.
Locally: deleted.
Externally: renamed to pro/hello.pro.renamed.
Answer (y) to accept the local delete.
Answer (n) to accept the external rename.
Keep the local version?
Enter "y" or "n" (or just press <return> for "n") Reverted 'pro/hello.pro.renamed'
Resolved conflicted state of 'pro/hello.pro'
#IF SVN1.8/9 Resolved conflicted state of 'pro/hello.pro'
#IF SVN1.10 Tree conflict at 'pro/hello.pro' marked as resolved.
__OUT__
file_cmp "$TEST_KEY.err" "$TEST_KEY.err" </dev/null
#-------------------------------------------------------------------------------
Expand Down
5 changes: 3 additions & 2 deletions t/fcm-conflicts/05-tree-edit-rename.t
Original file line number Diff line number Diff line change
Expand Up @@ -124,7 +124,7 @@ fcm merge --non-interactive $ROOT_URL/branches/dev/Share/ed_ren >/dev/null
run_pass "$TEST_KEY" fcm conflicts <<__IN__
y
__IN__
file_cmp "$TEST_KEY.out" "$TEST_KEY.out" <<__OUT__
file_cmp_filtered "$TEST_KEY.out" "$TEST_KEY.out" <<__OUT__
[info] pro/hello.pro: in tree conflict.
Locally: edited.
Externally: renamed to pro/hello.pro.renamed.
Expand All @@ -141,7 +141,8 @@ Enter "y" or "n" (or just press <return> for "n") diff3 pro/hello.pro.working pr
Merge contents (1)
Merge contents (2)
Reverted 'pro/hello.pro.renamed'
Resolved conflicted state of 'pro/hello.pro'
#IF SVN1.8/9 Resolved conflicted state of 'pro/hello.pro'
#IF SVN1.10 Tree conflict at 'pro/hello.pro' marked as resolved.
__OUT__
file_cmp "$TEST_KEY.err" "$TEST_KEY.err" </dev/null
#-------------------------------------------------------------------------------
Expand Down
10 changes: 6 additions & 4 deletions t/fcm-conflicts/07-tree-rename-edit.t
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ fcm merge --non-interactive $ROOT_URL/branches/dev/Share/ren_ed >/dev/null
run_pass "$TEST_KEY" fcm conflicts <<__IN__
n
__IN__
file_cmp "$TEST_KEY.out" "$TEST_KEY.out" <<__OUT__
file_cmp_filtered "$TEST_KEY.out" "$TEST_KEY.out" <<__OUT__
[info] pro/hello.pro: in tree conflict.
Locally: renamed to pro/hello.pro.renamed.
Externally: edited.
Expand All @@ -67,7 +67,8 @@ Enter "y" or "n" (or just press <return> for "n") diff3 pro/hello.pro.renamed.wo
Merge contents (1)
A pro/hello.pro
D pro/hello.pro.renamed
Resolved conflicted state of 'pro/hello.pro'
#IF SVN1.8/9 Resolved conflicted state of 'pro/hello.pro'
#IF SVN1.10 Tree conflict at 'pro/hello.pro' marked as resolved.
__OUT__
file_cmp "$TEST_KEY.err" "$TEST_KEY.err" </dev/null
#-------------------------------------------------------------------------------
Expand Down Expand Up @@ -105,7 +106,7 @@ fcm merge --non-interactive $ROOT_URL/branches/dev/Share/ren_ed >/dev/null
run_pass "$TEST_KEY" fcm conflicts <<__IN__
y
__IN__
file_cmp "$TEST_KEY.out" "$TEST_KEY.out" <<__OUT__
file_cmp_filtered "$TEST_KEY.out" "$TEST_KEY.out" <<__OUT__
[info] pro/hello.pro: in tree conflict.
Locally: renamed to pro/hello.pro.renamed.
Externally: edited.
Expand All @@ -120,7 +121,8 @@ Enter "y" or "n" (or just press <return> for "n") diff3 pro/hello.pro.renamed.wo
2:2a
3:3c
Merge contents (1)
Resolved conflicted state of 'pro/hello.pro'
#IF SVN1.8/9 Resolved conflicted state of 'pro/hello.pro'
#IF SVN1.10 Tree conflict at 'pro/hello.pro' marked as resolved.
__OUT__
file_cmp "$TEST_KEY.err" "$TEST_KEY.err" </dev/null
#-------------------------------------------------------------------------------
Expand Down
10 changes: 6 additions & 4 deletions t/fcm-conflicts/08-tree-rename-rename-diff.t
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@ fcm merge --non-interactive $ROOT_URL/branches/dev/Share/ren_ren >/dev/null
run_pass "$TEST_KEY" fcm conflicts <<__IN__
n
__IN__
file_cmp "$TEST_KEY.out" "$TEST_KEY.out" <<__OUT__
file_cmp_filtered "$TEST_KEY.out" "$TEST_KEY.out" <<__OUT__
[info] pro/hello.pro: in tree conflict.
Locally: renamed to pro/hello.pro.renamed-local.
Externally: renamed to pro/hello.pro.renamed-merge.
Expand All @@ -69,7 +69,8 @@ Enter "y" or "n" (or just press <return> for "n") diff3 pro/hello.pro.renamed-me
3:3c
Merge contents (1)
D pro/hello.pro.renamed-local
Resolved conflicted state of 'pro/hello.pro'
#IF SVN1.8/9 Resolved conflicted state of 'pro/hello.pro'
#IF SVN1.10 Tree conflict at 'pro/hello.pro' marked as resolved.
__OUT__
file_cmp "$TEST_KEY.err" "$TEST_KEY.err" </dev/null
#-------------------------------------------------------------------------------
Expand Down Expand Up @@ -105,7 +106,7 @@ fcm merge --non-interactive $ROOT_URL/branches/dev/Share/ren_ren >/dev/null
run_pass "$TEST_KEY" fcm conflicts <<__IN__
y
__IN__
file_cmp "$TEST_KEY.out" "$TEST_KEY.out" <<__OUT__
file_cmp_filtered "$TEST_KEY.out" "$TEST_KEY.out" <<__OUT__
[info] pro/hello.pro: in tree conflict.
Locally: renamed to pro/hello.pro.renamed-local.
Externally: renamed to pro/hello.pro.renamed-merge.
Expand All @@ -121,7 +122,8 @@ Enter "y" or "n" (or just press <return> for "n") diff3 pro/hello.pro.renamed-lo
3:3c
Merge contents (1)
Reverted 'pro/hello.pro.renamed-merge'
Resolved conflicted state of 'pro/hello.pro'
#IF SVN1.8/9 Resolved conflicted state of 'pro/hello.pro'
#IF SVN1.10 Tree conflict at 'pro/hello.pro' marked as resolved.
__OUT__
file_cmp "$TEST_KEY.err" "$TEST_KEY.err" </dev/null
#-------------------------------------------------------------------------------
Expand Down
3 changes: 2 additions & 1 deletion t/fcm-conflicts/09-tree-rename-rename-same.t
Original file line number Diff line number Diff line change
Expand Up @@ -112,7 +112,8 @@ Externally: added.
Answer (y) to keep the local file filename.
Answer (n) to keep the external file filename.
Keep the local version?
Enter "y" or "n" (or just press <return> for "n") Resolved conflicted state of 'pro/hello.pro.renamed'
#IF SVN1.8/9 Enter "y" or "n" (or just press <return> for "n") Resolved conflicted state of 'pro/hello.pro.renamed'
#IF SVN1.10 Enter "y" or "n" (or just press <return> for "n") Tree conflict at 'pro/hello.pro.renamed' marked as resolved.
__OUT__
file_cmp "$TEST_KEY.err" "$TEST_KEY.err" </dev/null
#-------------------------------------------------------------------------------
Expand Down

0 comments on commit 010d415

Please sign in to comment.