Hide Forgot
Upstream test suite fails at test editor-log-file1: ** expected: RCS file: /tmp/cvs-sanity/cvsrootdir/first-dir/file1,v Working file: file1 head: 1\.1 branch: locks: strict access list: keyword substitution: kv total revisions: 2; selected revisions: 2 description: ---------------------------- revision 1\.1 date: [0-9/]* [0-9:]*; author: petr; state: Exp; branches: 1\.1\.2; xCVS: ---------------------------------------------------------------------- xCVS: Enter Log. Lines beginning with .CVS:. are removed automatically xCVS: xCVS: Committing in . xCVS: xCVS: Added Files: xCVS: file1 file2 xCVS: ---------------------------------------------------------------------- ---------------------------- revision 1\.1\.2\.1 date: [0-9/]* [0-9:]*; author: petr; state: Exp; lines: +1 -0 xCVS: ---------------------------------------------------------------------- xCVS: Enter Log. Lines beginning with .CVS:. are removed automatically xCVS: xCVS: Committing in . xCVS: xCVS: Modified Files: xCVS: Tag: br xCVS: file1 xCVS: ---------------------------------------------------------------------- ============================================================================= ** got: RCS file: /tmp/cvs-sanity/cvsrootdir/first-dir/file1,v Working file: file1 head: 1.1 branch: locks: strict access list: keyword substitution: kv total revisions: 2; selected revisions: 2 description: ---------------------------- revision 1.1 date: 2013/12/03 16:01:09; author: petr; state: Exp; branches: 1.1.2; x xCVS: ---------------------------------------------------------------------- xCVS: Enter Log. Lines beginning with `CVS:' are removed automatically xCVS: xCVS: Committing in . xCVS: xCVS: Added Files: xCVS: file1 file2 xCVS: ---------------------------------------------------------------------- ---------------------------- revision 1.1.2.1 date: 2013/12/03 16:01:12; author: petr; state: Exp; lines: +1 -0 x xCVS: ---------------------------------------------------------------------- xCVS: Enter Log. Lines beginning with `CVS:' are removed automatically xCVS: xCVS: Committing in . xCVS: xCVS: Modified Files: xCVS: Tag: br xCVS: file1 xCVS: ---------------------------------------------------------------------- ============================================================================= FAIL: editor-log-file1 The problem is superfluous "x\n" in test output (i.e. a new line in the raw output) of `cvs log -N file1' command. The test does not match sources. The new line with adjusted tests has been added when solving bug #47457 and then the test has been broken when fixing bug #449424. Frankly I cannot see a reason why such change has been introduced. I'm tempted to revert the new line addition. However to conserve users' expectation, I will just fix the test. I.e. I will revert the cvs-1.11.22-cvspass.patch change of commit 3f856269f22dadc7480c362a08c56dd2ec01be7a. All Fedoras are affected.
Created attachment 832441 [details] Fix as patch against package sources This adds the missing "x\n" at two places in the test and it renames the patch file to match 1.11.23 CVS version.
We have another test failure. Now due to the bug #47457 merit. The parseroot-3r test fails because the $HOME/.cvspass gets autocreated, so a warning about open failure is missing in the `cvs logout' output.
Created attachment 832583 [details] Fix as patch against package sources This fixes both issues.