Many tests fail on OSX with SQLite 3.8.3. See the attached log.
Summary:
-1 to release
Platform
Mac OS X 10.9.1 Mavericks, build 13B42
Standard dependencies:
Apple clang(++) 5.0 (clang-500.2.79)/LLVM 3.3svn
APR 1.4.5
APR-Util 1.3.12
zlib 1.2.5
httpd 2.2.24
OpenSSL 0.9.8y
Python 2.7.5
Perl 5.16.2
Ruby 2.0.0p247
SQLite 3.7.13
Dependencies from homebrew:
SQLite 3.8.3
Serf 1.3.3
BDB 5.3.28
Swig 2.0.11
libmagic 5.16
Other dependencies:
Java 1.7.0_51-b13
JUnit 4.11
Verified:
Tarball contents and signatures
Successful tests:
(fsfs, bdb) x (local, svnserve, dav) with SQLite 3.7.13
check-all-javahl
check-swig-py
check-swig-rb
check-swig-pl
Failed tests:
fsfs local with SQLite 3.8.3
New issues:
- Many tests fail with SQLite 3.8.3.
- 'make swig-py and 'make swig-rb' do not work in out-of-tree builds
with the generated wrappers included in the tarball.
(N.B.: In 1.8.5, the included Swig wrappers did not work at all.)
Known issues:
- C tests do not work with the --enable-optimize configure option.
- Expanded URL keywords in the tarballs point to the release branch;
they should point to the tag instead.
--
Branko Čibej | Director of Subversion
WANdisco // Non-Stop Data
e. [email protected]
[[[
svn_tests: E200006: expected {3, "A/B-move/C", "base-deleted", moved-to
A/B-move/C-move}; found {3, "A/B-move/C", "base-deleted"}
FAIL: op-depth-test 12: test_wc_move
]]]
[[[
svn_tests: E200006: expected {3, "A/B2/C", "base-deleted", moved-to A/B2/C2};
found {3, "A/B2/C", "base-deleted"}
FAIL: op-depth-test 29: nested_moves_child_first
]]]
[[[
svn_tests: E200006: expected {2, "A2/B", "base-deleted", moved-to X/B}; found
{2, "A2/B", "base-deleted"}
FAIL: op-depth-test 34: move_to_swap
]]]
[[[
svn_tests: E200006: expected {3, "A2/B2/C2", "normal", copyfrom ^/A/B/C@1};
found {3, "A2/B2/C2", "normal", copyfrom ^/A/B/C@1, moved-here}
FAIL: op-depth-test 35: revert_nested_move
]]]
[[[
svn_tests: E200006: expected {1, "A/B", "normal", copyfrom ^/X/B@1, moved-to
B2}; found {1, "A/B", "normal", copyfrom ^/X/B@1}
FAIL: op-depth-test 36: move_on_move
]]]
[[[
svn_tests: E155005: No write-lock in
'/Volumes/svn-release-test/subversion/tests/libsvn_wc/svn-test-work/working-copies/move_update/A2'
FAIL: op-depth-test 39: move_update
]]]
[[[
svn_tests: E155005: No write-lock in
'/Volumes/svn-release-test/subversion/tests/libsvn_wc/svn-test-work/working-copies/update_prop_mod_into_moved/A2'
FAIL: op-depth-test 43: update_prop_mod_into_moved
]]]
[[[
svn_tests: E155005: No write-lock in
'/Volumes/svn-release-test/subversion/tests/libsvn_wc/svn-test-work/working-copies/nested_move_update/A2'
FAIL: op-depth-test 44: nested_move_update
]]]
[[[
svn_tests: E200006: expected {3, "A2/B/C", "base-deleted", moved-to C2}; found
{3, "A2/B/C", "base-deleted"}
FAIL: op-depth-test 45: nested_move_commit (issue 4291)
]]]
[[[
svn_tests: E200006: expected {2, "P/B2", "normal", copyfrom ^/A/B@2,
moved-here}; found {2, "P/B2", "normal", copyfrom ^/A/B@1, moved-here}
svn_tests: E200006: expected {1, "P/B", "normal", copyfrom ^/A/B@2,
moved-here}; found {1, "P/B", "normal", copyfrom ^/A/B@1, moved-here}
svn_tests: E200006: expected {1, "P", "normal", copyfrom ^/A@2, moved-here,
moved-to A}; found {1, "P", "normal", copyfrom ^/A@1, moved-here, moved-to A}
FAIL: op-depth-test 46: nested_move_update2
]]]
[[[
svn_tests: E155005: No write-lock in
'/Volumes/svn-release-test/subversion/tests/libsvn_wc/svn-test-work/working-copies/move_update_conflicts/A2'
FAIL: op-depth-test 47: move_update_conflicts
]]]
[[[
svn_tests: E155005: No write-lock in
'/Volumes/svn-release-test/subversion/tests/libsvn_wc/svn-test-work/working-copies/move_update_delete_mods/B2'
FAIL: op-depth-test 48: move_update_delete_mods
]]]
[[[
svn_tests: E200006: expected {3, "E/A/A", "base-deleted", moved-to D}; found
{3, "E/A/A", "base-deleted"}
svn_tests: E200006: expected {3, "D/A/A", "base-deleted", moved-to C}; found
{3, "D/A/A", "base-deleted"}
FAIL: op-depth-test 49: nested_moves2
]]]
[[[
svn_tests: E200006: expected {2, "A/B/C", "base-deleted", moved-to C2}; found
{2, "A/B/C", "base-deleted"}
FAIL: op-depth-test 50: move_in_delete (issue 4303)
]]]
[[[
svn_tests: E200006: expected {1, "C2", "normal", copyfrom ^/X/B/C@3,
moved-here}; found {1, "C2", "normal", copyfrom ^/A/B/C@2, moved-here}
FAIL: op-depth-test 51: switch_move
]]]
[[[
svn_tests: E200006: expected {1, "B", "normal", copyfrom ^/A@2, moved-here,
moved-to A}; found {1, "B", "normal", copyfrom ^/A@1, moved-here, moved-to A}
FAIL: op-depth-test 52: move_replace
]]]
[[[
svn_tests: E200006: expected {3, "X/B/C/D/E", "normal", copyfrom ^/C/D/E@1,
moved-here, moved-to E2}; found {3, "X/B/C/D/E", "normal", copyfrom ^/C/D/E@1,
moved-here}
FAIL: op-depth-test 53: layered_moved_to
]]]
[[[
svn_tests: E200006: Expected error 155027 but got 155005
svn_tests: E155005: No write-lock in
'/Volumes/svn-release-test/subversion/tests/libsvn_wc/svn-test-work/working-copies/update_within_move/X'
FAIL: op-depth-test 54: update_within_move
]]]
[[[
svn_tests: E200006: Expected error 155027 but got 155005
svn_tests: E155005: No write-lock in
'/Volumes/svn-release-test/subversion/tests/libsvn_wc/svn-test-work/working-copies/finite_move_update_bump/B2'
FAIL: op-depth-test 57: finite_move_update_bump
]]]
[[[
svn_tests: E200006: expected {1, "C2", "normal", copyfrom ^/A/B/C@1}; found {1,
"C2", "normal", copyfrom ^/A/B/C@1, moved-here}
svn_tests: E200006: expected {1, "Q2", "normal", copyfrom ^/P/Q@1}; found {1,
"Q2", "normal", copyfrom ^/P/Q@1, moved-here}
FAIL: op-depth-test 58: move_away_delete_update
]]]
[[[
svn_tests: E200006: expected {1, "A/B", "base-deleted", moved-to B}; found {1,
"A/B", "base-deleted"}
FAIL: op-depth-test 61: delete_over_moved_away
]]]
[[[
svn_tests: E200006: expected {2, "A/B/C", "base-deleted", moved-to C}; found
{2, "A/B/C", "base-deleted"}
FAIL: op-depth-test 62: moved_to op_depth
]]]
[[[
svn_tests: E200006: expected {3, "A/B/D", "base-deleted", moved-to D2}; found
{3, "A/B/D", "base-deleted"}
svn_tests: E200006: expected {3, "A/B/C", "base-deleted", moved-to A/B/C2};
found {3, "A/B/C", "base-deleted"}
FAIL: op-depth-test 64: move_back (issue 4302)
]]]
[[[
svn_tests: E200006: Expected error 155027 but got 155005
svn_tests: E155005: No write-lock in
'/Volumes/svn-release-test/subversion/tests/libsvn_wc/svn-test-work/working-copies/move_update_subtree/A/B2'
FAIL: op-depth-test 65: move_update_subtree (issue 4232)
]]]
[[[
svn_tests: E200006: expected {3, "B2/A/B", "base-deleted", moved-to B2}; found
{3, "B2/A/B", "base-deleted"}
FAIL: op-depth-test 66: move_parent_into_child (issue 4333)
]]]
[[[
svn_tests: E155005: No write-lock in
'/Volumes/svn-release-test/subversion/tests/libsvn_wc/svn-test-work/working-copies/move_depth_expand/C'
FAIL: op-depth-test 67: move depth expansion
]]]
[[[
svn_tests: E200006: expected {2, "A/B/A/D", "normal", copyfrom ^/A/A/A/D@1,
moved-here, moved-to D}; found {2, "A/B/A/D", "normal", copyfrom ^/A/A/A/D@1,
moved-here}
FAIL: op-depth-test 68: move retract (issue 4336)
]]]
[[[
svn_tests: E155005: No write-lock in
'/Volumes/svn-release-test/subversion/tests/libsvn_wc/svn-test-work/working-copies/update_with_tree_conflict/A2'
FAIL: op-depth-test 70: update with tree conflict (issue 4347)
]]]
[[[
svn_tests: E200006: expected {1, "A/B", "base-deleted", moved-to B}; found {1,
"A/B", "base-deleted"}
FAIL: op-depth-test 71: move child to parent and revert (issue 4436)
]]]
[[[
W: =============================================================
Expected 'F' and actual 'F' in status tree are different!
=============================================================
EXPECTED NODE TO BE:
=============================================================
* Node name: F
Path: svn-test-work/working_copies/copy_tests-83/A/B_tmp/F
Contents: None
Properties: {}
Attributes: {'status': 'D ', 'copied': '+', 'wc_rev': '-', 'moved_to':
'svn-test-work/working_copies/copy_tests-83/A/B_tmp/F_moved'}
Children: None (node is probably a file)
=============================================================
ACTUAL NODE FOUND:
=============================================================
* Node name: F
Path: svn-test-work/working_copies/copy_tests-83/A/B_tmp/F
Contents: None
Properties: {}
Attributes: {'status': 'D ', 'copied': '+', 'wc_rev': '-'}
Children: None (node is probably a file)
W: ACTUAL STATUS TREE:
svntest.wc.State(wc_dir, {
'' : Item(status=' ', wc_rev='1'),
'A' : Item(status=' ', wc_rev='1'),
'A/mu' : Item(status=' ', wc_rev='1'),
'A/B' : Item(status='D ', wc_rev='1',
moved_to='svn-test-work/working_copies/copy_tests-83/A/B_tmp'),
'A/B/E' : Item(status='D ', wc_rev='1'),
'A/B/E/alpha' : Item(status='D ', wc_rev='1'),
'A/B/E/beta' : Item(status='D ', wc_rev='1'),
'A/B/F' : Item(status='D ', wc_rev='1'),
'A/B/lambda' : Item(status='D ', wc_rev='1'),
'A/B_tmp' : Item(status='A ', copied='+',
moved_from='svn-test-work/working_copies/copy_tests-83/A/B', wc_rev='-'),
'A/B_tmp/F_moved' : Item(status='A ', copied='+', wc_rev='-'),
'A/B_tmp/E' : Item(status=' ', copied='+', wc_rev='-'),
'A/B_tmp/E/alpha' : Item(status='D ', copied='+', wc_rev='-'),
'A/B_tmp/E/alpha_moved': Item(status='A ', copied='+', wc_rev='-'),
'A/B_tmp/E/beta' : Item(status=' ', copied='+', wc_rev='-'),
'A/B_tmp/F' : Item(status='D ', copied='+', wc_rev='-'),
'A/B_tmp/lambda' : Item(status=' ', copied='+', wc_rev='-'),
'A/D' : Item(status=' ', wc_rev='1'),
'A/D/G' : Item(status=' ', wc_rev='1'),
'A/D/G/tau' : Item(status=' ', wc_rev='1'),
'A/D/G/rho' : Item(status=' ', wc_rev='1'),
'A/D/G/pi' : Item(status=' ', wc_rev='1'),
'A/D/H' : Item(status=' ', wc_rev='1'),
'A/D/H/omega' : Item(status=' ', wc_rev='1'),
'A/D/H/psi' : Item(status=' ', wc_rev='1'),
'A/D/H/chi' : Item(status=' ', wc_rev='1'),
'A/D/gamma' : Item(status=' ', wc_rev='1'),
'A/C' : Item(status=' ', wc_rev='1'),
'iota' : Item(status=' ', wc_rev='1'),
})
W: CWD: /Volumes/svn-release-test/subversion/tests/cmdline
W: EXCEPTION: SVNTreeUnequal
Traceback (most recent call last):
File
"/Users/brane/src/svn/rel/subversion-1.8.6/subversion/tests/cmdline/svntest/main.py",
line 1550, in run
rc = self.pred.run(sandbox)
File
"/Users/brane/src/svn/rel/subversion-1.8.6/subversion/tests/cmdline/svntest/testcase.py",
line 176, in run
return self.func(sandbox)
File
"/Users/brane/src/svn/rel/subversion-1.8.6/subversion/tests/cmdline/copy_tests.py",
line 4446, in move_dir_containing_move
svntest.actions.run_and_verify_status(sbox.wc_dir, expected_status)
File
"/Users/brane/src/svn/rel/subversion-1.8.6/subversion/tests/cmdline/svntest/actions.py",
line 1479, in run_and_verify_status
status_tree.compare_and_display('status', actual_status)
File
"/Users/brane/src/svn/rel/subversion-1.8.6/subversion/tests/cmdline/svntest/wc.py",
line 344, in compare_and_display
raise svntest.tree.SVNTreeUnequal
SVNTreeUnequal
FAIL: copy_tests.py 83: move a directory containing moved node
]]]
[[[
W: svn: warning: W155005: No write-lock in
'/Volumes/svn-release-test/subversion/tests/cmdline/svn-test-work/working_copies/move_tests-5/A/C2'
W: svn: E205011: Failure occurred resolving one or more conflicts
W: CWD: /Volumes/svn-release-test/subversion/tests/cmdline
W: EXCEPTION: Failure: Command failed:
"/Volumes/svn-release-test/subversion/svn/svn resolve --accept=mine-conflict
svn-test-work/working_copies/move_tests-5/A/C ..."; exit code 1
Traceback (most recent call last):
File
"/Users/brane/src/svn/rel/subversion-1.8.6/subversion/tests/cmdline/svntest/main.py",
line 1550, in run
rc = self.pred.run(sandbox)
File
"/Users/brane/src/svn/rel/subversion-1.8.6/subversion/tests/cmdline/svntest/testcase.py",
line 176, in run
return self.func(sandbox)
File
"/Users/brane/src/svn/rel/subversion-1.8.6/subversion/tests/cmdline/move_tests.py",
line 1104, in property_merge
sbox.ospath('A/C'))
File
"/Users/brane/src/svn/rel/subversion-1.8.6/subversion/tests/cmdline/svntest/actions.py",
line 282, in run_and_verify_svn
expected_exit, *varargs)
File
"/Users/brane/src/svn/rel/subversion-1.8.6/subversion/tests/cmdline/svntest/actions.py",
line 320, in run_and_verify_svn2
exit_code, out, err = main.run_svn(want_err, *varargs)
File
"/Users/brane/src/svn/rel/subversion-1.8.6/subversion/tests/cmdline/svntest/main.py",
line 682, in run_svn
*(_with_auth(_with_config_dir(varargs))))
File
"/Users/brane/src/svn/rel/subversion-1.8.6/subversion/tests/cmdline/svntest/main.py",
line 365, in run_command
None, *varargs)
File
"/Users/brane/src/svn/rel/subversion-1.8.6/subversion/tests/cmdline/svntest/main.py",
line 557, in run_command_stdin
'"; exit code ' + str(exit_code))
Failure: Command failed: "/Volumes/svn-release-test/subversion/svn/svn resolve
--accept=mine-conflict svn-test-work/working_copies/move_tests-5/A/C ..."; exit
code 1
FAIL: move_tests.py 5: test property merging on move-update
]]]
[[[
W: =============================================================
Expected 'AAA_1' and actual 'AAA_1' in status tree are different!
=============================================================
EXPECTED NODE TO BE:
=============================================================
* Node name: AAA_1
Path: svn-test-work/working_copies/move_tests-7/AAA_1
Contents: None
Properties: {}
Attributes: {'status': 'A ', 'copied': '+', 'moved_from':
'svn-test-work/working_copies/move_tests-7/A/A/A', 'wc_rev': '-'}
Children: None (node is probably a file)
=============================================================
ACTUAL NODE FOUND:
=============================================================
* Node name: AAA_1
Path: svn-test-work/working_copies/move_tests-7/AAA_1
Contents: None
Properties: {}
Attributes: {'status': 'A ', 'copied': '+', 'wc_rev': '-'}
Children: None (node is probably a file)
W: ACTUAL STATUS TREE:
svntest.wc.State(wc_dir, {
'' : Item(status=' ', wc_rev='2'),
'A' : Item(status='R ', copied='+',
moved_from='svn-test-work/working_copies/move_tests-7/B', wc_rev='-'),
'A/A' : Item(status='R ', copied='+',
moved_from='svn-test-work/working_copies/move_tests-7/C/A', wc_rev='-'),
'A/A/A' : Item(status='D ', copied='+', wc_rev='-',
moved_to='svn-test-work/working_copies/move_tests-7/AAA_3'),
'A/A/A/A' : Item(status='D ', copied='+', wc_rev='-'),
'C' : Item(status=' ', wc_rev='2'),
'C/A' : Item(status='D ', wc_rev='2',
moved_to='svn-test-work/working_copies/move_tests-7/A/A'),
'C/A/A' : Item(status='D ', wc_rev='2'),
'C/A/A/A' : Item(status='D ', wc_rev='2'),
'B' : Item(status='D ', wc_rev='2',
moved_to='svn-test-work/working_copies/move_tests-7/A'),
'B/A' : Item(status='D ', wc_rev='2'),
'B/A/A' : Item(status='D ', wc_rev='2'),
'B/A/A/A' : Item(status='D ', wc_rev='2'),
'AAA_1' : Item(status='A ', copied='+', wc_rev='-'),
'AAA_1/A' : Item(status=' ', copied='+', wc_rev='-'),
'AAA_2' : Item(status='A ', copied='+', wc_rev='-'),
'AAA_2/A' : Item(status=' ', copied='+', wc_rev='-'),
'AAA_3' : Item(status='A ', copied='+',
moved_from='svn-test-work/working_copies/move_tests-7/A/A/A', wc_rev='-'),
'AAA_3/A' : Item(status=' ', copied='+', wc_rev='-'),
})
W: CWD: /Volumes/svn-release-test/subversion/tests/cmdline
W: EXCEPTION: SVNTreeUnequal
Traceback (most recent call last):
File
"/Users/brane/src/svn/rel/subversion-1.8.6/subversion/tests/cmdline/svntest/main.py",
line 1550, in run
rc = self.pred.run(sandbox)
File
"/Users/brane/src/svn/rel/subversion-1.8.6/subversion/tests/cmdline/svntest/testcase.py",
line 176, in run
return self.func(sandbox)
File
"/Users/brane/src/svn/rel/subversion-1.8.6/subversion/tests/cmdline/move_tests.py",
line 1309, in move_many_update_delete
svntest.actions.run_and_verify_status(wc_dir, expected_status)
File
"/Users/brane/src/svn/rel/subversion-1.8.6/subversion/tests/cmdline/svntest/actions.py",
line 1479, in run_and_verify_status
status_tree.compare_and_display('status', actual_status)
File
"/Users/brane/src/svn/rel/subversion-1.8.6/subversion/tests/cmdline/svntest/wc.py",
line 344, in compare_and_display
raise svntest.tree.SVNTreeUnequal
SVNTreeUnequal
FAIL: move_tests.py 7: move many and delete-on-update
]]]
[[[
W: svn: warning: W155005: No write-lock in
'/Volumes/svn-release-test/subversion/tests/cmdline/svn-test-work/working_copies/stat_tests-41/A/B/E2'
W: svn: E205011: Failure occurred resolving one or more conflicts
W: CWD: /Volumes/svn-release-test/subversion/tests/cmdline
W: EXCEPTION: Failure: Command failed:
"/Volumes/svn-release-test/subversion/svn/svn resolve --accept=mine-conflict
svn-test-work/working_copies/stat_tests-41/A/B/E ..."; exit code 1
Traceback (most recent call last):
File
"/Users/brane/src/svn/rel/subversion-1.8.6/subversion/tests/cmdline/svntest/main.py",
line 1550, in run
rc = self.pred.run(sandbox)
File
"/Users/brane/src/svn/rel/subversion-1.8.6/subversion/tests/cmdline/svntest/testcase.py",
line 176, in run
return self.func(sandbox)
File
"/Users/brane/src/svn/rel/subversion-1.8.6/subversion/tests/cmdline/stat_tests.py",
line 2079, in move_update_timestamps
sbox.ospath('A/B/E'))
File
"/Users/brane/src/svn/rel/subversion-1.8.6/subversion/tests/cmdline/svntest/actions.py",
line 282, in run_and_verify_svn
expected_exit, *varargs)
File
"/Users/brane/src/svn/rel/subversion-1.8.6/subversion/tests/cmdline/svntest/actions.py",
line 320, in run_and_verify_svn2
exit_code, out, err = main.run_svn(want_err, *varargs)
File
"/Users/brane/src/svn/rel/subversion-1.8.6/subversion/tests/cmdline/svntest/main.py",
line 682, in run_svn
*(_with_auth(_with_config_dir(varargs))))
File
"/Users/brane/src/svn/rel/subversion-1.8.6/subversion/tests/cmdline/svntest/main.py",
line 365, in run_command
None, *varargs)
File
"/Users/brane/src/svn/rel/subversion-1.8.6/subversion/tests/cmdline/svntest/main.py",
line 557, in run_command_stdin
'"; exit code ' + str(exit_code))
Failure: Command failed: "/Volumes/svn-release-test/subversion/svn/svn resolve
--accept=mine-conflict svn-test-work/working_copies/stat_tests-41/A/B/E ...";
exit code 1
FAIL: stat_tests.py 41: timestamp behaviour for move-update
]]]
[[[
W: Unexpected output
W: EXPECTED STDOUT:
W: | 1:2M
W: ACTUAL STDOUT:
W: | 1:2
W: DIFF STDOUT:
W: | --- EXPECTED STDOUT
W: | +++ ACTUAL STDOUT
W: | @@ -1 +1 @@
W: | -1:2M
W: | +1:2
W: CWD: /Volumes/svn-release-test/subversion/tests/cmdline
W: EXCEPTION: SVNLineUnequal
Traceback (most recent call last):
File
"/Users/brane/src/svn/rel/subversion-1.8.6/subversion/tests/cmdline/svntest/main.py",
line 1550, in run
rc = self.pred.run(sandbox)
File
"/Users/brane/src/svn/rel/subversion-1.8.6/subversion/tests/cmdline/svntest/testcase.py",
line 176, in run
return self.func(sandbox)
File
"/Users/brane/src/svn/rel/subversion-1.8.6/subversion/tests/cmdline/svnversion_tests.py",
line 94, in svnversion_test
[ "1:2M\n" ], [])
File
"/Users/brane/src/svn/rel/subversion-1.8.6/subversion/tests/cmdline/svntest/actions.py",
line 253, in run_and_verify_svnversion
expected_exit, *varargs)
File
"/Users/brane/src/svn/rel/subversion-1.8.6/subversion/tests/cmdline/svntest/actions.py",
line 266, in run_and_verify_svnversion2
expected_stdout, expected_stderr)
File
"/Users/brane/src/svn/rel/subversion-1.8.6/subversion/tests/cmdline/svntest/verify.py",
line 445, in verify_outputs
compare_and_display_lines(message, label, expected, actual, raisable)
File
"/Users/brane/src/svn/rel/subversion-1.8.6/subversion/tests/cmdline/svntest/verify.py",
line 418, in compare_and_display_lines
raise raisable
SVNLineUnequal
FAIL: svnversion_tests.py 1: test 'svnversion' on files and directories
]]]
[[[
W: svn: warning: W155005: No write-lock in
'/Volumes/svn-release-test/subversion/tests/cmdline/svn-test-work/working_copies/update_tests-60/A/B/E2'
W: svn: E205011: Failure occurred resolving one or more conflicts
W: CWD: /Volumes/svn-release-test/subversion/tests/cmdline
W: EXCEPTION: Failure: Command failed:
"/Volumes/svn-release-test/subversion/svn/svn resolve --accept=mine-conflict
svn-test-work/working_copies/update_tests-60/A/B/E ..."; exit code 1
Traceback (most recent call last):
File
"/Users/brane/src/svn/rel/subversion-1.8.6/subversion/tests/cmdline/svntest/main.py",
line 1550, in run
rc = self.pred.run(sandbox)
File
"/Users/brane/src/svn/rel/subversion-1.8.6/subversion/tests/cmdline/svntest/testcase.py",
line 176, in run
return self.func(sandbox)
File
"/Users/brane/src/svn/rel/subversion-1.8.6/subversion/tests/cmdline/update_tests.py",
line 5476, in update_moved_dir_leaf_del
sbox.ospath('A/B/E'))
File
"/Users/brane/src/svn/rel/subversion-1.8.6/subversion/tests/cmdline/svntest/actions.py",
line 282, in run_and_verify_svn
expected_exit, *varargs)
File
"/Users/brane/src/svn/rel/subversion-1.8.6/subversion/tests/cmdline/svntest/actions.py",
line 320, in run_and_verify_svn2
exit_code, out, err = main.run_svn(want_err, *varargs)
File
"/Users/brane/src/svn/rel/subversion-1.8.6/subversion/tests/cmdline/svntest/main.py",
line 682, in run_svn
*(_with_auth(_with_config_dir(varargs))))
File
"/Users/brane/src/svn/rel/subversion-1.8.6/subversion/tests/cmdline/svntest/main.py",
line 365, in run_command
None, *varargs)
File
"/Users/brane/src/svn/rel/subversion-1.8.6/subversion/tests/cmdline/svntest/main.py",
line 557, in run_command_stdin
'"; exit code ' + str(exit_code))
Failure: Command failed: "/Volumes/svn-release-test/subversion/svn/svn resolve
--accept=mine-conflict svn-test-work/working_copies/update_tests-60/A/B/E ...";
exit code 1
FAIL: update_tests.py 60: update locally moved dir with leaf del
]]]
[[[
W: svn: warning: W155005: No write-lock in
'/Volumes/svn-release-test/subversion/tests/cmdline/svn-test-work/working_copies/update_tests-61/A/B/E2'
W: svn: E205011: Failure occurred resolving one or more conflicts
W: CWD: /Volumes/svn-release-test/subversion/tests/cmdline
W: EXCEPTION: Failure: Command failed:
"/Volumes/svn-release-test/subversion/svn/svn resolve --accept=mine-conflict
svn-test-work/working_copies/update_tests-61/A/B/E ..."; exit code 1
Traceback (most recent call last):
File
"/Users/brane/src/svn/rel/subversion-1.8.6/subversion/tests/cmdline/svntest/main.py",
line 1550, in run
rc = self.pred.run(sandbox)
File
"/Users/brane/src/svn/rel/subversion-1.8.6/subversion/tests/cmdline/svntest/testcase.py",
line 176, in run
return self.func(sandbox)
File
"/Users/brane/src/svn/rel/subversion-1.8.6/subversion/tests/cmdline/update_tests.py",
line 5532, in update_moved_dir_edited_leaf_del
sbox.ospath('A/B/E'))
File
"/Users/brane/src/svn/rel/subversion-1.8.6/subversion/tests/cmdline/svntest/actions.py",
line 282, in run_and_verify_svn
expected_exit, *varargs)
File
"/Users/brane/src/svn/rel/subversion-1.8.6/subversion/tests/cmdline/svntest/actions.py",
line 320, in run_and_verify_svn2
exit_code, out, err = main.run_svn(want_err, *varargs)
File
"/Users/brane/src/svn/rel/subversion-1.8.6/subversion/tests/cmdline/svntest/main.py",
line 682, in run_svn
*(_with_auth(_with_config_dir(varargs))))
File
"/Users/brane/src/svn/rel/subversion-1.8.6/subversion/tests/cmdline/svntest/main.py",
line 365, in run_command
None, *varargs)
File
"/Users/brane/src/svn/rel/subversion-1.8.6/subversion/tests/cmdline/svntest/main.py",
line 557, in run_command_stdin
'"; exit code ' + str(exit_code))
Failure: Command failed: "/Volumes/svn-release-test/subversion/svn/svn resolve
--accept=mine-conflict svn-test-work/working_copies/update_tests-61/A/B/E ...";
exit code 1
FAIL: update_tests.py 61: update locally moved dir with edited leaf del
]]]
[[[
W: svn: warning: W155005: No write-lock in
'/Volumes/svn-release-test/subversion/tests/cmdline/svn-test-work/working_copies/update_tests-62/A/B/E2'
W: svn: E205011: Failure occurred resolving one or more conflicts
W: CWD: /Volumes/svn-release-test/subversion/tests/cmdline
W: EXCEPTION: Failure: Command failed:
"/Volumes/svn-release-test/subversion/svn/svn resolve --accept=mine-conflict
svn-test-work/working_copies/update_tests-62/A/B/E ..."; exit code 1
Traceback (most recent call last):
File
"/Users/brane/src/svn/rel/subversion-1.8.6/subversion/tests/cmdline/svntest/main.py",
line 1550, in run
rc = self.pred.run(sandbox)
File
"/Users/brane/src/svn/rel/subversion-1.8.6/subversion/tests/cmdline/svntest/testcase.py",
line 176, in run
return self.func(sandbox)
File
"/Users/brane/src/svn/rel/subversion-1.8.6/subversion/tests/cmdline/update_tests.py",
line 5590, in update_moved_dir_file_add
sbox.ospath('A/B/E'))
File
"/Users/brane/src/svn/rel/subversion-1.8.6/subversion/tests/cmdline/svntest/actions.py",
line 282, in run_and_verify_svn
expected_exit, *varargs)
File
"/Users/brane/src/svn/rel/subversion-1.8.6/subversion/tests/cmdline/svntest/actions.py",
line 320, in run_and_verify_svn2
exit_code, out, err = main.run_svn(want_err, *varargs)
File
"/Users/brane/src/svn/rel/subversion-1.8.6/subversion/tests/cmdline/svntest/main.py",
line 682, in run_svn
*(_with_auth(_with_config_dir(varargs))))
File
"/Users/brane/src/svn/rel/subversion-1.8.6/subversion/tests/cmdline/svntest/main.py",
line 365, in run_command
None, *varargs)
File
"/Users/brane/src/svn/rel/subversion-1.8.6/subversion/tests/cmdline/svntest/main.py",
line 557, in run_command_stdin
'"; exit code ' + str(exit_code))
Failure: Command failed: "/Volumes/svn-release-test/subversion/svn/svn resolve
--accept=mine-conflict svn-test-work/working_copies/update_tests-62/A/B/E ...";
exit code 1
FAIL: update_tests.py 62: update locally moved dir with incoming file
]]]
[[[
W: svn: warning: W155005: No write-lock in
'/Volumes/svn-release-test/subversion/tests/cmdline/svn-test-work/working_copies/update_tests-64/A/B/E2'
W: svn: E205011: Failure occurred resolving one or more conflicts
W: CWD: /Volumes/svn-release-test/subversion/tests/cmdline
W: EXCEPTION: Failure: Command failed:
"/Volumes/svn-release-test/subversion/svn/svn resolve --accept=mine-conflict
svn-test-work/working_copies/update_tests-64/A/B/E ..."; exit code 1
Traceback (most recent call last):
File
"/Users/brane/src/svn/rel/subversion-1.8.6/subversion/tests/cmdline/svntest/main.py",
line 1550, in run
rc = self.pred.run(sandbox)
File
"/Users/brane/src/svn/rel/subversion-1.8.6/subversion/tests/cmdline/svntest/testcase.py",
line 176, in run
return self.func(sandbox)
File
"/Users/brane/src/svn/rel/subversion-1.8.6/subversion/tests/cmdline/update_tests.py",
line 5709, in update_moved_dir_file_move
sbox.ospath('A/B/E'))
File
"/Users/brane/src/svn/rel/subversion-1.8.6/subversion/tests/cmdline/svntest/actions.py",
line 282, in run_and_verify_svn
expected_exit, *varargs)
File
"/Users/brane/src/svn/rel/subversion-1.8.6/subversion/tests/cmdline/svntest/actions.py",
line 320, in run_and_verify_svn2
exit_code, out, err = main.run_svn(want_err, *varargs)
File
"/Users/brane/src/svn/rel/subversion-1.8.6/subversion/tests/cmdline/svntest/main.py",
line 682, in run_svn
*(_with_auth(_with_config_dir(varargs))))
File
"/Users/brane/src/svn/rel/subversion-1.8.6/subversion/tests/cmdline/svntest/main.py",
line 365, in run_command
None, *varargs)
File
"/Users/brane/src/svn/rel/subversion-1.8.6/subversion/tests/cmdline/svntest/main.py",
line 557, in run_command_stdin
'"; exit code ' + str(exit_code))
Failure: Command failed: "/Volumes/svn-release-test/subversion/svn/svn resolve
--accept=mine-conflict svn-test-work/working_copies/update_tests-64/A/B/E ...";
exit code 1
FAIL: update_tests.py 64: update locally moved dir with incoming file move
]]]
[[[
W: =============================================================
Expected 'E' and actual 'E' in status tree are different!
=============================================================
EXPECTED NODE TO BE:
=============================================================
* Node name: E
Path: svn-test-work/working_copies/update_tests-75/A/E
Contents: None
Properties: {}
Attributes: {'status': 'A ', 'copied': '+', 'moved_from':
'svn-test-work/working_copies/update_tests-75/A/E/B/E', 'wc_rev': '-'}
Children: None (node is probably a file)
=============================================================
ACTUAL NODE FOUND:
=============================================================
* Node name: E
Path: svn-test-work/working_copies/update_tests-75/A/E
Contents: None
Properties: {}
Attributes: {'status': 'A ', 'copied': '+', 'wc_rev': '-'}
Children: None (node is probably a file)
W: ACTUAL STATUS TREE:
svntest.wc.State(wc_dir, {
'' : Item(status=' ', wc_rev='1'),
'A' : Item(status=' ', wc_rev='1'),
'A/E' : Item(status='A ', copied='+', wc_rev='-'),
'A/E/B' : Item(status='A ', copied='+',
moved_from='svn-test-work/working_copies/update_tests-75/A/B', wc_rev='-'),
'A/E/B/E' : Item(status='D ', copied='+', wc_rev='-'),
'A/E/B/E/alpha' : Item(status='D ', copied='+', wc_rev='-'),
'A/E/B/E/beta' : Item(status='D ', copied='+', wc_rev='-'),
'A/E/B/F' : Item(status=' ', copied='+', wc_rev='-'),
'A/E/B/lambda' : Item(status=' ', copied='+', wc_rev='-'),
'A/E/alpha' : Item(status=' ', copied='+', wc_rev='-'),
'A/E/beta' : Item(status=' ', copied='+', wc_rev='-'),
'A/D' : Item(status=' ', wc_rev='1'),
'A/D/G' : Item(status=' ', wc_rev='1'),
'A/D/G/rho' : Item(status=' ', wc_rev='1'),
'A/D/G/tau' : Item(status=' ', wc_rev='1'),
'A/D/G/pi' : Item(status=' ', wc_rev='1'),
'A/D/H' : Item(status=' ', wc_rev='1'),
'A/D/H/psi' : Item(status=' ', wc_rev='1'),
'A/D/H/omega' : Item(status=' ', wc_rev='1'),
'A/D/H/chi' : Item(status=' ', wc_rev='1'),
'A/D/gamma' : Item(status=' ', wc_rev='1'),
'A/B' : Item(status='D ', wc_rev='1',
moved_to='svn-test-work/working_copies/update_tests-75/A/E/B'),
'A/B/E' : Item(status='D ', wc_rev='1'),
'A/B/E/beta' : Item(status='D ', wc_rev='1'),
'A/B/E/alpha' : Item(status='D ', wc_rev='1'),
'A/B/lambda' : Item(status='D ', wc_rev='1'),
'A/B/F' : Item(status='D ', wc_rev='1'),
'A/C' : Item(status=' ', wc_rev='1'),
'A/mu' : Item(status=' ', wc_rev='1'),
'iota' : Item(status=' ', wc_rev='1'),
})
W: CWD: /Volumes/svn-release-test/subversion/tests/cmdline
W: EXCEPTION: SVNTreeUnequal
Traceback (most recent call last):
File
"/Users/brane/src/svn/rel/subversion-1.8.6/subversion/tests/cmdline/svntest/main.py",
line 1550, in run
rc = self.pred.run(sandbox)
File
"/Users/brane/src/svn/rel/subversion-1.8.6/subversion/tests/cmdline/svntest/testcase.py",
line 176, in run
return self.func(sandbox)
File
"/Users/brane/src/svn/rel/subversion-1.8.6/subversion/tests/cmdline/update_tests.py",
line 6432, in update_swapped_depth_dirs
svntest.actions.run_and_verify_status(wc_dir, expected_status)
File
"/Users/brane/src/svn/rel/subversion-1.8.6/subversion/tests/cmdline/svntest/actions.py",
line 1479, in run_and_verify_status
status_tree.compare_and_display('status', actual_status)
File
"/Users/brane/src/svn/rel/subversion-1.8.6/subversion/tests/cmdline/svntest/wc.py",
line 344, in compare_and_display
raise svntest.tree.SVNTreeUnequal
SVNTreeUnequal
FAIL: update_tests.py 75: text mod to file in swapped depth dir
]]]
[[[
W: svn: warning: W155005: No write-lock in
'/Volumes/svn-release-test/subversion/tests/cmdline/svn-test-work/working_copies/update_tests-76/A/B2'
W: svn: E205011: Failure occurred resolving one or more conflicts
W: CWD: /Volumes/svn-release-test/subversion/tests/cmdline
W: EXCEPTION: Failure: Command failed:
"/Volumes/svn-release-test/subversion/svn/svn resolve --accept=mine-conflict
svn-test-work/working_copies/update_tests-76/A/B ..."; exit code 1
Traceback (most recent call last):
File
"/Users/brane/src/svn/rel/subversion-1.8.6/subversion/tests/cmdline/svntest/main.py",
line 1550, in run
rc = self.pred.run(sandbox)
File
"/Users/brane/src/svn/rel/subversion-1.8.6/subversion/tests/cmdline/svntest/testcase.py",
line 176, in run
return self.func(sandbox)
File
"/Users/brane/src/svn/rel/subversion-1.8.6/subversion/tests/cmdline/update_tests.py",
line 6527, in move_update_props
sbox.ospath('A/B'))
File
"/Users/brane/src/svn/rel/subversion-1.8.6/subversion/tests/cmdline/svntest/actions.py",
line 282, in run_and_verify_svn
expected_exit, *varargs)
File
"/Users/brane/src/svn/rel/subversion-1.8.6/subversion/tests/cmdline/svntest/actions.py",
line 320, in run_and_verify_svn2
exit_code, out, err = main.run_svn(want_err, *varargs)
File
"/Users/brane/src/svn/rel/subversion-1.8.6/subversion/tests/cmdline/svntest/main.py",
line 682, in run_svn
*(_with_auth(_with_config_dir(varargs))))
File
"/Users/brane/src/svn/rel/subversion-1.8.6/subversion/tests/cmdline/svntest/main.py",
line 365, in run_command
None, *varargs)
File
"/Users/brane/src/svn/rel/subversion-1.8.6/subversion/tests/cmdline/svntest/main.py",
line 557, in run_command_stdin
'"; exit code ' + str(exit_code))
Failure: Command failed: "/Volumes/svn-release-test/subversion/svn/svn resolve
--accept=mine-conflict svn-test-work/working_copies/update_tests-76/A/B ...";
exit code 1
FAIL: update_tests.py 76: move-update with property mods
]]]
