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/26 13:17:36 UTC
svn commit: r989605 - in /subversion/trunk/subversion/tests/cmdline:
merge_tree_conflict_tests.py svntest/actions.py
Author: julianfoad
Date: Thu Aug 26 11:17:36 2010
New Revision: 989605
URL: http://svn.apache.org/viewvc?rev=989605&view=rev
Log:
Refactor the definitions of some test expectations. No change to the
expectations.
* subversion/tests/cmdline/merge_tree_conflict_tests.py
(disk_after_leaf_del_no_ci): Import from svntest.actions.
(disk_after_tree_del_no_ci): Import from svntest.actions instead of
defining it here.
(tree_conflicts_on_merge_local_ci_5_2): Use disk_after_leaf_del instead of
literal data.
(tree_conflicts_on_merge_no_local_ci_5_2): Use disk_after_leaf_del_no_ci
instead of literal data.
* subversion/tests/cmdline/svntest/actions.py
(disk_after_leaf_del_no_ci, disk_after_tree_del_no_ci): New functions.
Modified:
subversion/trunk/subversion/tests/cmdline/merge_tree_conflict_tests.py
subversion/trunk/subversion/tests/cmdline/svntest/actions.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=989605&r1=989604&r2=989605&view=diff
==============================================================================
--- subversion/trunk/subversion/tests/cmdline/merge_tree_conflict_tests.py (original)
+++ subversion/trunk/subversion/tests/cmdline/merge_tree_conflict_tests.py Thu Aug 26 11:17:36 2010
@@ -802,26 +802,8 @@ leaf_del = svntest.actions.deep_trees_le
disk_after_leaf_edit = svntest.actions.deep_trees_after_leaf_edit
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(),
- })
+disk_after_leaf_del_no_ci = svntest.actions.deep_trees_after_leaf_del_no_ci
+disk_after_tree_del_no_ci = svntest.actions.deep_trees_after_tree_del_no_ci
deep_trees_conflict_output = svntest.actions.deep_trees_conflict_output
@@ -970,14 +952,7 @@ def tree_conflicts_on_merge_local_ci_5_2
expected_output = deep_trees_conflict_output
- expected_disk = svntest.wc.State('', {
- 'F' : Item(),
- 'D' : Item(),
- 'DF/D1' : Item(),
- 'DD/D1' : Item(),
- 'DDF/D1/D2' : Item(),
- 'DDD/D1/D2' : Item(),
- })
+ expected_disk = disk_after_leaf_del
expected_status = svntest.wc.State('', {
'' : Item(status=' M', wc_rev='3'),
@@ -1204,14 +1179,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_leaf_del_no_ci(sbox.wc_dir)
expected_status = svntest.wc.State('', {
'' : Item(status=' M', wc_rev='3'),
Modified: subversion/trunk/subversion/tests/cmdline/svntest/actions.py
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/tests/cmdline/svntest/actions.py?rev=989605&r1=989604&r2=989605&view=diff
==============================================================================
--- subversion/trunk/subversion/tests/cmdline/svntest/actions.py (original)
+++ subversion/trunk/subversion/tests/cmdline/svntest/actions.py Thu Aug 26 11:17:36 2010
@@ -2074,6 +2074,13 @@ deep_trees_after_leaf_del = wc.State('',
'DDD/D1/D2' : Item(),
})
+# deep trees state after a call to deep_trees_leaf_del with no commit
+def deep_trees_after_leaf_del_no_ci(wc_dir):
+ if svntest.main.wc_is_singledb(wc_dir):
+ return deep_trees_after_leaf_del
+ else:
+ return deep_trees_empty_dirs
+
def deep_trees_tree_del(base):
"""Helper function for deep trees test cases. Delete top-level dirs."""
@@ -2132,6 +2139,13 @@ deep_trees_empty_dirs = wc.State('', {
'DDD/D1/D2/D3' : Item(),
})
+# deep trees state after a call to deep_trees_tree_del with no commit
+def deep_trees_after_tree_del_no_ci(wc_dir):
+ if svntest.main.wc_is_singledb(wc_dir):
+ return deep_trees_after_tree_del
+ else:
+ return deep_trees_empty_dirs
+
def deep_trees_tree_del_repos(base):
"""Helper function for deep trees test cases. Delete top-level dirs,
directly in the repository."""