Skip to content

Commit 010d415

Browse files
dpmatthewsdpmatthews
committed
Fix remaining t/svn-conflicts tests to work with svn 1.10.7
Use Trac 1.2 with Ubuntu 16.04 (1.4 not working)
1 parent 4c9ca72 commit 010d415

File tree

7 files changed

+25
-16
lines changed

7 files changed

+25
-16
lines changed

‎.github/workflows/tests.yaml‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,8 @@ jobs:
2525
libdbd-sqlite3-perl \
2626
python-subversion libsvn-perl \
2727
s-nail
28-
[[ ${{matrix.ubuntu}} != "ubuntu-20.04" ]] && sudo pip install 'trac' || true
28+
[[ ${{matrix.ubuntu}} == "ubuntu-16.04" ]] && sudo pip install 'trac==1.2' || true
29+
[[ ${{matrix.ubuntu}} == "ubuntu-18.04" ]] && sudo pip install 'trac' || true
2930
echo "#!/bin/bash" >"${PWD}/bin/gfortran"
3031
echo 'exec gfortran-9 "$@"' >>"${PWD}/bin/gfortran"
3132
chmod +x "${PWD}/bin/gfortran"

‎t/fcm-conflicts/00-tree-add-add.t‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -48,14 +48,15 @@ fcm merge --non-interactive $ROOT_URL/branches/dev/Share/add_add >/dev/null
4848
run_pass "$TEST_KEY" fcm conflicts <<__IN__
4949
n
5050
__IN__
51-
file_cmp "$TEST_KEY.out" "$TEST_KEY.out" <<__OUT__
51+
file_cmp_filtered "$TEST_KEY.out" "$TEST_KEY.out" <<__OUT__
5252
[info] new_file: in tree conflict.
5353
Locally: added.
5454
Externally: added.
5555
Answer (y) to keep the local file filename.
5656
Answer (n) to keep the external file filename.
5757
Keep the local version?
58-
Enter "y" or "n" (or just press <return> for "n") Resolved conflicted state of 'new_file'
58+
#IF SVN1.8/9 Enter "y" or "n" (or just press <return> for "n") Resolved conflicted state of 'new_file'
59+
#IF SVN1.10 Enter "y" or "n" (or just press <return> for "n") Tree conflict at 'new_file' marked as resolved.
5960
__OUT__
6061
file_cmp "$TEST_KEY.err" "$TEST_KEY.err" </dev/null
6162
#-------------------------------------------------------------------------------

‎t/fcm-conflicts/03-tree-delete-rename.t‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -91,15 +91,16 @@ fcm merge --non-interactive $ROOT_URL/branches/dev/Share/del_ren >/dev/null
9191
run_pass "$TEST_KEY" fcm conflicts <<__IN__
9292
y
9393
__IN__
94-
file_cmp "$TEST_KEY.out" "$TEST_KEY.out" <<__OUT__
94+
file_cmp_filtered "$TEST_KEY.out" "$TEST_KEY.out" <<__OUT__
9595
[info] pro/hello.pro: in tree conflict.
9696
Locally: deleted.
9797
Externally: renamed to pro/hello.pro.renamed.
9898
Answer (y) to accept the local delete.
9999
Answer (n) to accept the external rename.
100100
Keep the local version?
101101
Enter "y" or "n" (or just press <return> for "n") Reverted 'pro/hello.pro.renamed'
102-
Resolved conflicted state of 'pro/hello.pro'
102+
#IF SVN1.8/9 Resolved conflicted state of 'pro/hello.pro'
103+
#IF SVN1.10 Tree conflict at 'pro/hello.pro' marked as resolved.
103104
__OUT__
104105
file_cmp "$TEST_KEY.err" "$TEST_KEY.err" </dev/null
105106
#-------------------------------------------------------------------------------

‎t/fcm-conflicts/05-tree-edit-rename.t‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -124,7 +124,7 @@ fcm merge --non-interactive $ROOT_URL/branches/dev/Share/ed_ren >/dev/null
124124
run_pass "$TEST_KEY" fcm conflicts <<__IN__
125125
y
126126
__IN__
127-
file_cmp "$TEST_KEY.out" "$TEST_KEY.out" <<__OUT__
127+
file_cmp_filtered "$TEST_KEY.out" "$TEST_KEY.out" <<__OUT__
128128
[info] pro/hello.pro: in tree conflict.
129129
Locally: edited.
130130
Externally: renamed to pro/hello.pro.renamed.
@@ -141,7 +141,8 @@ Enter "y" or "n" (or just press <return> for "n") diff3 pro/hello.pro.working pr
141141
Merge contents (1)
142142
Merge contents (2)
143143
Reverted 'pro/hello.pro.renamed'
144-
Resolved conflicted state of 'pro/hello.pro'
144+
#IF SVN1.8/9 Resolved conflicted state of 'pro/hello.pro'
145+
#IF SVN1.10 Tree conflict at 'pro/hello.pro' marked as resolved.
145146
__OUT__
146147
file_cmp "$TEST_KEY.err" "$TEST_KEY.err" </dev/null
147148
#-------------------------------------------------------------------------------

‎t/fcm-conflicts/07-tree-rename-edit.t‎

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ fcm merge --non-interactive $ROOT_URL/branches/dev/Share/ren_ed >/dev/null
5050
run_pass "$TEST_KEY" fcm conflicts <<__IN__
5151
n
5252
__IN__
53-
file_cmp "$TEST_KEY.out" "$TEST_KEY.out" <<__OUT__
53+
file_cmp_filtered "$TEST_KEY.out" "$TEST_KEY.out" <<__OUT__
5454
[info] pro/hello.pro: in tree conflict.
5555
Locally: renamed to pro/hello.pro.renamed.
5656
Externally: edited.
@@ -67,7 +67,8 @@ Enter "y" or "n" (or just press <return> for "n") diff3 pro/hello.pro.renamed.wo
6767
Merge contents (1)
6868
A pro/hello.pro
6969
D pro/hello.pro.renamed
70-
Resolved conflicted state of 'pro/hello.pro'
70+
#IF SVN1.8/9 Resolved conflicted state of 'pro/hello.pro'
71+
#IF SVN1.10 Tree conflict at 'pro/hello.pro' marked as resolved.
7172
__OUT__
7273
file_cmp "$TEST_KEY.err" "$TEST_KEY.err" </dev/null
7374
#-------------------------------------------------------------------------------
@@ -105,7 +106,7 @@ fcm merge --non-interactive $ROOT_URL/branches/dev/Share/ren_ed >/dev/null
105106
run_pass "$TEST_KEY" fcm conflicts <<__IN__
106107
y
107108
__IN__
108-
file_cmp "$TEST_KEY.out" "$TEST_KEY.out" <<__OUT__
109+
file_cmp_filtered "$TEST_KEY.out" "$TEST_KEY.out" <<__OUT__
109110
[info] pro/hello.pro: in tree conflict.
110111
Locally: renamed to pro/hello.pro.renamed.
111112
Externally: edited.
@@ -120,7 +121,8 @@ Enter "y" or "n" (or just press <return> for "n") diff3 pro/hello.pro.renamed.wo
120121
2:2a
121122
3:3c
122123
Merge contents (1)
123-
Resolved conflicted state of 'pro/hello.pro'
124+
#IF SVN1.8/9 Resolved conflicted state of 'pro/hello.pro'
125+
#IF SVN1.10 Tree conflict at 'pro/hello.pro' marked as resolved.
124126
__OUT__
125127
file_cmp "$TEST_KEY.err" "$TEST_KEY.err" </dev/null
126128
#-------------------------------------------------------------------------------

‎t/fcm-conflicts/08-tree-rename-rename-diff.t‎

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ fcm merge --non-interactive $ROOT_URL/branches/dev/Share/ren_ren >/dev/null
5353
run_pass "$TEST_KEY" fcm conflicts <<__IN__
5454
n
5555
__IN__
56-
file_cmp "$TEST_KEY.out" "$TEST_KEY.out" <<__OUT__
56+
file_cmp_filtered "$TEST_KEY.out" "$TEST_KEY.out" <<__OUT__
5757
[info] pro/hello.pro: in tree conflict.
5858
Locally: renamed to pro/hello.pro.renamed-local.
5959
Externally: renamed to pro/hello.pro.renamed-merge.
@@ -69,7 +69,8 @@ Enter "y" or "n" (or just press <return> for "n") diff3 pro/hello.pro.renamed-me
6969
3:3c
7070
Merge contents (1)
7171
D pro/hello.pro.renamed-local
72-
Resolved conflicted state of 'pro/hello.pro'
72+
#IF SVN1.8/9 Resolved conflicted state of 'pro/hello.pro'
73+
#IF SVN1.10 Tree conflict at 'pro/hello.pro' marked as resolved.
7374
__OUT__
7475
file_cmp "$TEST_KEY.err" "$TEST_KEY.err" </dev/null
7576
#-------------------------------------------------------------------------------
@@ -105,7 +106,7 @@ fcm merge --non-interactive $ROOT_URL/branches/dev/Share/ren_ren >/dev/null
105106
run_pass "$TEST_KEY" fcm conflicts <<__IN__
106107
y
107108
__IN__
108-
file_cmp "$TEST_KEY.out" "$TEST_KEY.out" <<__OUT__
109+
file_cmp_filtered "$TEST_KEY.out" "$TEST_KEY.out" <<__OUT__
109110
[info] pro/hello.pro: in tree conflict.
110111
Locally: renamed to pro/hello.pro.renamed-local.
111112
Externally: renamed to pro/hello.pro.renamed-merge.
@@ -121,7 +122,8 @@ Enter "y" or "n" (or just press <return> for "n") diff3 pro/hello.pro.renamed-lo
121122
3:3c
122123
Merge contents (1)
123124
Reverted 'pro/hello.pro.renamed-merge'
124-
Resolved conflicted state of 'pro/hello.pro'
125+
#IF SVN1.8/9 Resolved conflicted state of 'pro/hello.pro'
126+
#IF SVN1.10 Tree conflict at 'pro/hello.pro' marked as resolved.
125127
__OUT__
126128
file_cmp "$TEST_KEY.err" "$TEST_KEY.err" </dev/null
127129
#-------------------------------------------------------------------------------

‎t/fcm-conflicts/09-tree-rename-rename-same.t‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -112,7 +112,8 @@ Externally: added.
112112
Answer (y) to keep the local file filename.
113113
Answer (n) to keep the external file filename.
114114
Keep the local version?
115-
Enter "y" or "n" (or just press <return> for "n") Resolved conflicted state of 'pro/hello.pro.renamed'
115+
#IF SVN1.8/9 Enter "y" or "n" (or just press <return> for "n") Resolved conflicted state of 'pro/hello.pro.renamed'
116+
#IF SVN1.10 Enter "y" or "n" (or just press <return> for "n") Tree conflict at 'pro/hello.pro.renamed' marked as resolved.
116117
__OUT__
117118
file_cmp "$TEST_KEY.err" "$TEST_KEY.err" </dev/null
118119
#-------------------------------------------------------------------------------

0 commit comments

Comments
 (0)