You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@subversion.apache.org by ju...@apache.org on 2010/08/25 19:23:53 UTC
svn commit: r989235 -
/subversion/trunk/subversion/tests/cmdline/merge_tree_conflict_tests.py
Author: julianfoad
Date: Wed Aug 25 17:23:52 2010
New Revision: 989235
URL: http://svn.apache.org/viewvc?rev=989235&view=rev
Log:
Correct the expectations in three tests in merge_tree_conflict_tests.py so
they pass in single-DB mode as well as multi-DB mode.
* subversion/tests/cmdline/merge_tree_conflict_tests.py
(disk_after_tree_del_no_ci): New variable, with a value conditional on
wc_is_singledb().
(tree_conflicts_on_merge_no_local_ci_4_1,
tree_conflicts_on_merge_no_local_ci_4_2,
tree_conflicts_on_merge_no_local_ci_6): Use disk_after_tree_del_no_ci.
Modified:
subversion/trunk/subversion/tests/cmdline/merge_tree_conflict_tests.py
Modified: subversion/trunk/subversion/tests/cmdline/merge_tree_conflict_tests.py
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/tests/cmdline/merge_tree_conflict_tests.py?rev=989235&r1=989234&r2=989235&view=diff
==============================================================================
--- subversion/trunk/subversion/tests/cmdline/merge_tree_conflict_tests.py (original)
+++ subversion/trunk/subversion/tests/cmdline/merge_tree_conflict_tests.py Wed Aug 25 17:23:52 2010
@@ -803,6 +803,25 @@ disk_after_leaf_edit = svntest.actions.d
disk_after_leaf_del = svntest.actions.deep_trees_after_leaf_del
disk_after_tree_del = svntest.actions.deep_trees_after_tree_del
+if svntest.main.wc_is_singledb(''):
+ disk_after_tree_del_no_ci = svntest.wc.State('', {
+ 'F' : Item(),
+ 'D' : Item(),
+ 'DF' : Item(),
+ 'DD' : Item(),
+ 'DDF' : Item(),
+ 'DDD' : Item(),
+ })
+else:
+ disk_after_tree_del_no_ci = svntest.wc.State('', {
+ 'F' : Item(),
+ 'D/D1' : Item(),
+ 'DF/D1' : Item(),
+ 'DD/D1/D2' : Item(),
+ 'DDF/D1/D2' : Item(),
+ 'DDD/D1/D2/D3' : Item(),
+ })
+
deep_trees_conflict_output = svntest.actions.deep_trees_conflict_output
j = os.path.join
@@ -1037,14 +1056,7 @@ def tree_conflicts_on_merge_no_local_ci_
expected_output = deep_trees_conflict_output
- expected_disk = svntest.wc.State('', {
- 'F' : Item(),
- 'D/D1' : Item(),
- 'DF/D1' : Item(),
- 'DD/D1/D2' : Item(),
- 'DDF/D1/D2' : Item(),
- 'DDD/D1/D2/D3' : Item(),
- })
+ expected_disk = disk_after_tree_del_no_ci
expected_status = svntest.wc.State('', {
'' : Item(status=' M', wc_rev='3'),
@@ -1090,14 +1102,7 @@ def tree_conflicts_on_merge_no_local_ci_
expected_output = deep_trees_conflict_output
- expected_disk = svntest.wc.State('', {
- 'F' : Item(),
- 'D/D1' : Item(),
- 'DF/D1' : Item(),
- 'DD/D1/D2' : Item(),
- 'DDF/D1/D2' : Item(),
- 'DDD/D1/D2/D3' : Item(),
- })
+ expected_disk = disk_after_tree_del_no_ci
expected_status = svntest.wc.State('', {
'' : Item(status=' M', wc_rev='3'),
@@ -1248,14 +1253,7 @@ def tree_conflicts_on_merge_no_local_ci_
expected_output = deep_trees_conflict_output
- expected_disk = svntest.wc.State('', {
- 'F' : Item(),
- 'D/D1' : Item(),
- 'DF/D1' : Item(),
- 'DD/D1/D2' : Item(),
- 'DDF/D1/D2' : Item(),
- 'DDD/D1/D2/D3' : Item(),
- })
+ expected_disk = disk_after_tree_del_no_ci
expected_status = svntest.wc.State('', {
'' : Item(status=' M', wc_rev='3'),