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 20:06:54 UTC
svn commit: r989273 -
/subversion/trunk/subversion/tests/cmdline/merge_tree_conflict_tests.py
Author: julianfoad
Date: Wed Aug 25 18:06:54 2010
New Revision: 989273
URL: http://svn.apache.org/viewvc?rev=989273&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 function.
(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=989273&r1=989272&r2=989273&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 18:06:54 2010
@@ -803,6 +803,26 @@ 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
+def disk_after_tree_del_no_ci(wc_dir):
+ if svntest.main.wc_is_singledb(wc_dir):
+ return svntest.wc.State('', {
+ 'F' : Item(),
+ 'D' : Item(),
+ 'DF' : Item(),
+ 'DD' : Item(),
+ 'DDF' : Item(),
+ 'DDD' : Item(),
+ })
+ else:
+ return 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
@@ -1032,19 +1052,14 @@ def tree_conflicts_on_merge_local_ci_6(s
def tree_conflicts_on_merge_no_local_ci_4_1(sbox):
"tree conflicts 4.1: tree del (no ci), leaf edit"
+ sbox.build()
+
# use case 4, as in notes/tree-conflicts/use-cases.txt
# 4.1) local tree delete, incoming leaf edit
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(sbox.wc_dir)
expected_status = svntest.wc.State('', {
'' : Item(status=' M', wc_rev='3'),
@@ -1086,18 +1101,13 @@ def tree_conflicts_on_merge_no_local_ci_
def tree_conflicts_on_merge_no_local_ci_4_2(sbox):
"tree conflicts 4.2: tree del (no ci), leaf del"
+ sbox.build()
+
# 4.2) local tree delete, incoming leaf delete
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(sbox.wc_dir)
expected_status = svntest.wc.State('', {
'' : Item(status=' M', wc_rev='3'),
@@ -1243,19 +1253,14 @@ def tree_conflicts_on_merge_no_local_ci_
def tree_conflicts_on_merge_no_local_ci_6(sbox):
"tree conflicts 6: tree del (no ci), tree del"
+ sbox.build()
+
# use case 6, as in notes/tree-conflicts/use-cases.txt
# local tree delete, incoming tree delete
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(sbox.wc_dir)
expected_status = svntest.wc.State('', {
'' : Item(status=' M', wc_rev='3'),