Author: rhuijben
Date: Tue Dec 10 10:36:06 2013
New Revision: 1549805
URL: http://svn.apache.org/r1549805
Log:
Remove some remains of pre Subversion 1.7 working copy test scenarios.
* subversion/tests/cmdline/svntest/deeptrees.py
(deep_trees_after_leaf_del_no_ci,
deep_trees_after_tree_del_no_ci): Assume that we use a single wc.db per
working copy.
(deep_trees_empty_dirs): Remove now unused variable.
* subversion/tests/cmdline/upgrade_tests.py
(check_format): Assume single db.
Modified:
subversion/trunk/subversion/tests/cmdline/svntest/deeptrees.py
subversion/trunk/subversion/tests/cmdline/upgrade_tests.py
Modified: subversion/trunk/subversion/tests/cmdline/svntest/deeptrees.py
URL:
http://svn.apache.org/viewvc/subversion/trunk/subversion/tests/cmdline/svntest/deeptrees.py?rev=1549805&r1=1549804&r2=1549805&view=diff
==============================================================================
--- subversion/trunk/subversion/tests/cmdline/svntest/deeptrees.py (original)
+++ subversion/trunk/subversion/tests/cmdline/svntest/deeptrees.py Tue Dec 10
10:36:06 2013
@@ -196,11 +196,7 @@ deep_trees_after_leaf_del = wc.State('',
# 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
-
+ return deep_trees_after_leaf_del
def deep_trees_tree_del(base):
"""Helper function for deep trees test cases. Delete top-level dirs."""
@@ -240,31 +236,9 @@ deep_trees_after_tree_del = wc.State('',
'DDD' : Item(),
})
-# deep trees state without any files
-deep_trees_empty_dirs = wc.State('', {
- 'F' : Item(),
- 'D' : Item(),
- 'D/D1' : Item(),
- 'DF' : Item(),
- 'DF/D1' : Item(),
- 'DD' : Item(),
- 'DD/D1' : Item(),
- 'DD/D1/D2' : Item(),
- 'DDF' : Item(),
- 'DDF/D1' : Item(),
- 'DDF/D1/D2' : Item(),
- 'DDD' : Item(),
- 'DDD/D1' : Item(),
- 'DDD/D1/D2' : Item(),
- '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
+ return deep_trees_after_tree_del
def deep_trees_tree_del_repos(base):
"""Helper function for deep trees test cases. Delete top-level dirs,
Modified: subversion/trunk/subversion/tests/cmdline/upgrade_tests.py
URL:
http://svn.apache.org/viewvc/subversion/trunk/subversion/tests/cmdline/upgrade_tests.py?rev=1549805&r1=1549804&r2=1549805&view=diff
==============================================================================
--- subversion/trunk/subversion/tests/cmdline/upgrade_tests.py (original)
+++ subversion/trunk/subversion/tests/cmdline/upgrade_tests.py Tue Dec 10
10:36:06 2013
@@ -109,8 +109,7 @@ def check_format(sbox, expected_format):
raise svntest.Failure("found format '%d'; expected '%d'; in wc '%s'" %
(found_format, expected_format, root))
- if svntest.main.wc_is_singledb(sbox.wc_dir):
- dirs[:] = []
+ dirs[:] = []
if dot_svn in dirs:
dirs.remove(dot_svn)
