[[[ W: Unexpected output W: EXPECTED STDOUT (match_all=True): W: | Index: foo W: | =================================================================== W: | --- foo (nonexistent) W: | +++ foo (working copy) W: | @@ -0,0 +1,2 @@ W: | +xxx W: | +yyy W: ACTUAL STDOUT: W: | Index: foo W: | =================================================================== W: | Cannot display: file marked as a binary type. W: | svn:mime-type = application/octet-stream W: | W: | Property changes on: foo W: | ___________________________________________________________________ W: | Added: svn:mime-type W: | ## -0,0 +1 ## W: | +application/octet-stream W: | \ No newline at end of property W: DIFF STDOUT (match_all=True): W: | --- EXPECTED STDOUT (match_all=True) W: | +++ ACTUAL STDOUT W: | @@ -1,7 +1,11 @@ W: | Index: foo W: | =================================================================== W: | ---- foo (nonexistent) W: | -+++ foo (working copy) W: | -@@ -0,0 +1,2 @@ W: | -+xxx W: | -+yyy W: | +Cannot display: file marked as a binary type. W: | +svn:mime-type = application/octet-stream W: | + W: | +Property changes on: foo W: | +___________________________________________________________________ W: | +Added: svn:mime-type W: | +## -0,0 +1 ## W: | ++application/octet-stream W: | +\ No newline at end of property W: CWD: /dev/shm/svn-test-work/working_copies/diff_tests-27 W: EXCEPTION: SVNLineUnequal Traceback (most recent call last): File "/home/abuild/rpmbuild/BUILD/subversion-1.14.1/subversion/tests/cmdline/svntest/main.py", line 1927, in run rc = self.pred.run(sandbox) File "/home/abuild/rpmbuild/BUILD/subversion-1.14.1/subversion/tests/cmdline/svntest/testcase.py", line 178, in run result = self.func(sandbox) File "/home/abuild/rpmbuild/BUILD/subversion-1.14.1/subversion/tests/cmdline/diff_tests.py", line 2077, in diff_schedule_delete svntest.actions.run_and_verify_svn(expected_output_r1_base, [], File "/home/abuild/rpmbuild/BUILD/subversion-1.14.1/subversion/tests/cmdline/svntest/actions.py", line 339, in run_and_verify_svn return run_and_verify_svn2(expected_stdout, expected_stderr, File "/home/abuild/rpmbuild/BUILD/subversion-1.14.1/subversion/tests/cmdline/svntest/actions.py", line 379, in run_and_verify_svn2 verify.verify_outputs("Unexpected output", out, err, File "/home/abuild/rpmbuild/BUILD/subversion-1.14.1/subversion/tests/cmdline/svntest/verify.py", line 531, in verify_outputs compare_and_display_lines(message, label, expected, actual, raisable) File "/home/abuild/rpmbuild/BUILD/subversion-1.14.1/subversion/tests/cmdline/svntest/verify.py", line 504, in compare_and_display_lines raise raisable svntest.main.SVNLineUnequal FAIL: diff_tests.py 27: scheduled deleted ]]] [[[ =============== DIFFS NOT EQUAL =================== Expected ('Index: A2/D/G/rho\n', '===================================================================\n', '--- A2/D/G/rho\t(nonexistent)\n', '+++ A2/D/G/rho\t(revision 8)\n', '@@ -0,0 +1 @@\n', '+88\n', '\\ No newline at end of file\n') Actual: Index: A2/D/G/rho =================================================================== Cannot display: file marked as a binary type. svn:mime-type = application/octet-stream Property changes on: A2/D/G/rho ___________________________________________________________________ Added: svn:mime-type ## -0,0 +1 ## +application/octet-stream \ No newline at end of property W: CWD: /home/abuild/rpmbuild/BUILD/subversion-1.14.1/subversion/tests/cmdline W: EXCEPTION: Failure: Diffs not equal Traceback (most recent call last): File "/home/abuild/rpmbuild/BUILD/subversion-1.14.1/subversion/tests/cmdline/svntest/main.py", line 1927, in run rc = self.pred.run(sandbox) File "/home/abuild/rpmbuild/BUILD/subversion-1.14.1/subversion/tests/cmdline/svntest/testcase.py", line 178, in run result = self.func(sandbox) File "/home/abuild/rpmbuild/BUILD/subversion-1.14.1/subversion/tests/cmdline/log_tests.py", line 2182, in log_diff compare_diff_output(r8diff, log_chain[2]['diff_lines']) File "/home/abuild/rpmbuild/BUILD/subversion-1.14.1/subversion/tests/cmdline/log_tests.py", line 722, in compare_diff_output raise svntest.Failure("Diffs not equal") svntest.Failure: Diffs not equal FAIL: log_tests.py 36: 'svn log --diff' ]]] [[[ W: ============================================================= Expected 'foo' and actual 'foo' in output tree are different! ============================================================= EXPECTED NODE TO BE: ============================================================= * Node name: foo Path: svn-test-work/working_copies/merge_tests-2/A/B/F/foo Contents: None Properties: {} Attributes: {'verb': 'Adding'} Children: None (node is probably a file) ============================================================= ACTUAL NODE FOUND: ============================================================= * Node name: foo Path: svn-test-work/working_copies/merge_tests-2/A/B/F/foo Contents: None Properties: {} Attributes: {'verb': 'Adding (bin)'} Children: None (node is probably a file) W: Unequal at node foo W: Unequal at node F W: Unequal at node B W: Unequal at node A W: Unequal at node merge_tests-2 W: Unequal at node working_copies W: Unequal at node svn-test-work W: Output of commit is unexpected W: EXPECTED OUTPUT TREE: W: ROOT +-- svn-test-work +-- working_copies +-- merge_tests-2 +-- A +-- B +-- F |-- Q | |-- bar | +-- bar2 |-- Q2 |-- foo +-- foo2 W: ACTUAL OUTPUT TREE: W: ROOT +-- svn-test-work +-- working_copies +-- merge_tests-2 +-- A +-- B +-- F |-- Q | |-- bar | +-- bar2 |-- Q2 |-- foo +-- foo2 W: ACTUAL OUTPUT TREE: svntest.wc.State(wc_dir, { 'A/B/F/Q' : Item(verb='Adding'), 'A/B/F/Q/bar' : Item(verb='Adding'), 'A/B/F/Q/bar2' : Item(verb='Adding'), 'A/B/F/Q2' : Item(verb='Adding'), 'A/B/F/foo' : Item(verb='Adding (bin)'), 'A/B/F/foo2' : Item(verb='Adding'), }) W: CWD: /home/abuild/rpmbuild/BUILD/subversion-1.14.1/subversion/tests/cmdline W: EXCEPTION: SVNTreeUnequal Traceback (most recent call last): File "/home/abuild/rpmbuild/BUILD/subversion-1.14.1/subversion/tests/cmdline/svntest/main.py", line 1927, in run rc = self.pred.run(sandbox) File "/home/abuild/rpmbuild/BUILD/subversion-1.14.1/subversion/tests/cmdline/svntest/testcase.py", line 258, in run return self._delegate.run(sandbox) File "/home/abuild/rpmbuild/BUILD/subversion-1.14.1/subversion/tests/cmdline/svntest/testcase.py", line 178, in run result = self.func(sandbox) File "/home/abuild/rpmbuild/BUILD/subversion-1.14.1/subversion/tests/cmdline/merge_tests.py", line 403, in add_with_history svntest.actions.run_and_verify_commit(wc_dir, File "/home/abuild/rpmbuild/BUILD/subversion-1.14.1/subversion/tests/cmdline/svntest/actions.py", line 1565, in run_and_verify_commit tree.compare_trees("output", actual, output_tree) File "/home/abuild/rpmbuild/BUILD/subversion-1.14.1/subversion/tests/cmdline/svntest/tree.py", line 683, in compare_trees compare_trees(label, a_child, b_child, File "/home/abuild/rpmbuild/BUILD/subversion-1.14.1/subversion/tests/cmdline/svntest/tree.py", line 683, in compare_trees compare_trees(label, a_child, b_child, File "/home/abuild/rpmbuild/BUILD/subversion-1.14.1/subversion/tests/cmdline/svntest/tree.py", line 683, in compare_trees compare_trees(label, a_child, b_child, [Previous line repeated 4 more times] File "/home/abuild/rpmbuild/BUILD/subversion-1.14.1/subversion/tests/cmdline/svntest/tree.py", line 661, in compare_trees raise SVNTreeUnequal svntest.tree.SVNTreeUnequal FAIL: merge_tests.py 2: merge and add new files/dirs with history ]]] [[[ W: ============================================================= Expected 'foo' and actual 'foo' in output tree are different! ============================================================= EXPECTED NODE TO BE: ============================================================= * Node name: foo Path: svn-test-work/working_copies/merge_tests-15/A/B/F/foo Contents: None Properties: {} Attributes: {'verb': 'Adding'} Children: None (node is probably a file) ============================================================= ACTUAL NODE FOUND: ============================================================= * Node name: foo Path: svn-test-work/working_copies/merge_tests-15/A/B/F/foo Contents: None Properties: {} Attributes: {'verb': 'Adding (bin)'} Children: None (node is probably a file) W: Unequal at node foo W: Unequal at node F W: Unequal at node B W: Unequal at node A W: Unequal at node merge_tests-15 W: Unequal at node working_copies W: Unequal at node svn-test-work W: Output of commit is unexpected W: EXPECTED OUTPUT TREE: W: ROOT +-- svn-test-work +-- working_copies +-- merge_tests-15 +-- A +-- B +-- F |-- Q | +-- bar +-- foo W: ACTUAL OUTPUT TREE: W: ROOT +-- svn-test-work +-- working_copies +-- merge_tests-15 +-- A +-- B +-- F |-- Q | +-- bar +-- foo W: ACTUAL OUTPUT TREE: svntest.wc.State(wc_dir, { 'A/B/F/Q' : Item(verb='Adding'), 'A/B/F/Q/bar' : Item(verb='Adding'), 'A/B/F/foo' : Item(verb='Adding (bin)'), }) W: CWD: /home/abuild/rpmbuild/BUILD/subversion-1.14.1/subversion/tests/cmdline W: EXCEPTION: SVNTreeUnequal Traceback (most recent call last): File "/home/abuild/rpmbuild/BUILD/subversion-1.14.1/subversion/tests/cmdline/svntest/main.py", line 1927, in run rc = self.pred.run(sandbox) File "/home/abuild/rpmbuild/BUILD/subversion-1.14.1/subversion/tests/cmdline/svntest/testcase.py", line 258, in run return self._delegate.run(sandbox) File "/home/abuild/rpmbuild/BUILD/subversion-1.14.1/subversion/tests/cmdline/svntest/testcase.py", line 178, in run result = self.func(sandbox) File "/home/abuild/rpmbuild/BUILD/subversion-1.14.1/subversion/tests/cmdline/merge_tests.py", line 1342, in merge_skips_obstructions svntest.actions.run_and_verify_commit(wc_dir, File "/home/abuild/rpmbuild/BUILD/subversion-1.14.1/subversion/tests/cmdline/svntest/actions.py", line 1565, in run_and_verify_commit tree.compare_trees("output", actual, output_tree) File "/home/abuild/rpmbuild/BUILD/subversion-1.14.1/subversion/tests/cmdline/svntest/tree.py", line 683, in compare_trees compare_trees(label, a_child, b_child, File "/home/abuild/rpmbuild/BUILD/subversion-1.14.1/subversion/tests/cmdline/svntest/tree.py", line 683, in compare_trees compare_trees(label, a_child, b_child, File "/home/abuild/rpmbuild/BUILD/subversion-1.14.1/subversion/tests/cmdline/svntest/tree.py", line 683, in compare_trees compare_trees(label, a_child, b_child, [Previous line repeated 4 more times] File "/home/abuild/rpmbuild/BUILD/subversion-1.14.1/subversion/tests/cmdline/svntest/tree.py", line 661, in compare_trees raise SVNTreeUnequal svntest.tree.SVNTreeUnequal FAIL: merge_tests.py 15: merge should skip over unversioned obstructions ]]] [[[ W: ============================================================= Expected 'foo' and actual 'foo' in output tree are different! ============================================================= EXPECTED NODE TO BE: ============================================================= * Node name: foo Path: svn-test-work/working_copies/merge_tests-16/A/B/F/foo Contents: None Properties: {} Attributes: {'verb': 'Adding'} Children: None (node is probably a file) ============================================================= ACTUAL NODE FOUND: ============================================================= * Node name: foo Path: svn-test-work/working_copies/merge_tests-16/A/B/F/foo Contents: None Properties: {} Attributes: {'verb': 'Adding (bin)'} Children: None (node is probably a file) W: Unequal at node foo W: Unequal at node F W: Unequal at node B W: Unequal at node A W: Unequal at node merge_tests-16 W: Unequal at node working_copies W: Unequal at node svn-test-work W: Output of commit is unexpected W: EXPECTED OUTPUT TREE: W: ROOT +-- svn-test-work +-- working_copies +-- merge_tests-16 +-- A +-- B +-- F |-- Q +-- foo W: ACTUAL OUTPUT TREE: W: ROOT +-- svn-test-work +-- working_copies +-- merge_tests-16 +-- A +-- B +-- F |-- Q +-- foo W: ACTUAL OUTPUT TREE: svntest.wc.State(wc_dir, { 'A/B/F/Q' : Item(verb='Adding'), 'A/B/F/foo' : Item(verb='Adding (bin)'), }) W: CWD: /home/abuild/rpmbuild/BUILD/subversion-1.14.1/subversion/tests/cmdline W: EXCEPTION: SVNTreeUnequal Traceback (most recent call last): File "/home/abuild/rpmbuild/BUILD/subversion-1.14.1/subversion/tests/cmdline/svntest/main.py", line 1927, in run rc = self.pred.run(sandbox) File "/home/abuild/rpmbuild/BUILD/subversion-1.14.1/subversion/tests/cmdline/svntest/testcase.py", line 258, in run return self._delegate.run(sandbox) File "/home/abuild/rpmbuild/BUILD/subversion-1.14.1/subversion/tests/cmdline/svntest/testcase.py", line 178, in run result = self.func(sandbox) File "/home/abuild/rpmbuild/BUILD/subversion-1.14.1/subversion/tests/cmdline/merge_tests.py", line 1634, in merge_into_missing svntest.actions.run_and_verify_commit(wc_dir, File "/home/abuild/rpmbuild/BUILD/subversion-1.14.1/subversion/tests/cmdline/svntest/actions.py", line 1565, in run_and_verify_commit tree.compare_trees("output", actual, output_tree) File "/home/abuild/rpmbuild/BUILD/subversion-1.14.1/subversion/tests/cmdline/svntest/tree.py", line 683, in compare_trees compare_trees(label, a_child, b_child, File "/home/abuild/rpmbuild/BUILD/subversion-1.14.1/subversion/tests/cmdline/svntest/tree.py", line 683, in compare_trees compare_trees(label, a_child, b_child, File "/home/abuild/rpmbuild/BUILD/subversion-1.14.1/subversion/tests/cmdline/svntest/tree.py", line 683, in compare_trees compare_trees(label, a_child, b_child, [Previous line repeated 4 more times] File "/home/abuild/rpmbuild/BUILD/subversion-1.14.1/subversion/tests/cmdline/svntest/tree.py", line 661, in compare_trees raise SVNTreeUnequal svntest.tree.SVNTreeUnequal FAIL: merge_tests.py 16: merge into missing must not break working copy ]]] [[[ W: Unexpected output W: EXPECTED STDOUT (unordered): W: | Properties on 'G': W: | svn:mergeinfo W: | Properties on 'G/M': W: | key W: | Properties on 'G/file': W: | key W: | Properties on 'G/M/N': W: | key W: | Properties on 'G/M/file': W: | key W: ACTUAL STDOUT: W: | Properties on 'G': W: | svn:mergeinfo W: | Properties on 'G/M': W: | key W: | Properties on 'G/M/N': W: | key W: | Properties on 'G/M/file': W: | key W: | svn:mime-type W: | Properties on 'G/file': W: | key W: | svn:mime-type W: DIFF STDOUT (unordered): W: | --- EXPECTED STDOUT (unordered) W: | +++ ACTUAL STDOUT W: | @@ -3,6 +3,8 @@ W: | key W: | key W: | svn:mergeinfo W: | + svn:mime-type W: | + svn:mime-type W: | Properties on 'G': W: | Properties on 'G/M': W: | Properties on 'G/M/N': W: CWD: /dev/shm/svn-test-work/working_copies/merge_tests-134 W: EXCEPTION: SVNLineUnequal Traceback (most recent call last): File "/home/abuild/rpmbuild/BUILD/subversion-1.14.1/subversion/tests/cmdline/svntest/main.py", line 1927, in run rc = self.pred.run(sandbox) File "/home/abuild/rpmbuild/BUILD/subversion-1.14.1/subversion/tests/cmdline/svntest/testcase.py", line 258, in run return self._delegate.run(sandbox) File "/home/abuild/rpmbuild/BUILD/subversion-1.14.1/subversion/tests/cmdline/svntest/testcase.py", line 178, in run result = self.func(sandbox) File "/home/abuild/rpmbuild/BUILD/subversion-1.14.1/subversion/tests/cmdline/merge_tests.py", line 17418, in merge_properties_on_adds svntest.actions.run_and_verify_svn(expected_output, [], File "/home/abuild/rpmbuild/BUILD/subversion-1.14.1/subversion/tests/cmdline/svntest/actions.py", line 339, in run_and_verify_svn return run_and_verify_svn2(expected_stdout, expected_stderr, File "/home/abuild/rpmbuild/BUILD/subversion-1.14.1/subversion/tests/cmdline/svntest/actions.py", line 379, in run_and_verify_svn2 verify.verify_outputs("Unexpected output", out, err, File "/home/abuild/rpmbuild/BUILD/subversion-1.14.1/subversion/tests/cmdline/svntest/verify.py", line 531, in verify_outputs compare_and_display_lines(message, label, expected, actual, raisable) File "/home/abuild/rpmbuild/BUILD/subversion-1.14.1/subversion/tests/cmdline/svntest/verify.py", line 504, in compare_and_display_lines raise raisable svntest.main.SVNLineUnequal FAIL: merge_tests.py 134: merged directory properties are added ]]]