You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@subversion.apache.org by da...@apache.org on 2010/08/07 20:13:12 UTC
svn commit: r983275 [2/2] - in /subversion/branches/atomic-revprop: ./
notes/ subversion/bindings/swig/
subversion/bindings/swig/python/libsvn_swig_py/
subversion/bindings/swig/python/tests/ subversion/include/
subversion/libsvn_ra_neon/ subversion/lib...
Modified: subversion/branches/atomic-revprop/subversion/tests/cmdline/svntest/sandbox.py
URL: http://svn.apache.org/viewvc/subversion/branches/atomic-revprop/subversion/tests/cmdline/svntest/sandbox.py?rev=983275&r1=983274&r2=983275&view=diff
==============================================================================
--- subversion/branches/atomic-revprop/subversion/tests/cmdline/svntest/sandbox.py (original)
+++ subversion/branches/atomic-revprop/subversion/tests/cmdline/svntest/sandbox.py Sat Aug 7 18:13:11 2010
@@ -51,8 +51,8 @@ class Sandbox:
self.repo_url = (svntest.main.options.test_area_url + '/'
+ svntest.main.pathname2url(self.repo_dir))
else:
- self.repo_dir = svntest.main.pristine_dir
- self.repo_url = svntest.main.pristine_url
+ self.repo_dir = svntest.main.pristine_greek_repos_dir
+ self.repo_url = svntest.main.pristine_greek_repos_url
### TODO: Move this into to the build() method
# For dav tests we need a single authz file which must be present,
@@ -96,11 +96,8 @@ class Sandbox:
and check out a WC from it (unless CREATE_WC is false). Change the
sandbox's name to NAME. See actions.make_repo_and_wc() for details."""
self._set_name(name, read_only)
- if svntest.actions.make_repo_and_wc(self, create_wc, read_only):
- raise svntest.Failure("Could not build repository and sandbox '%s'"
- % self.name)
- else:
- self._is_built = True
+ svntest.actions.make_repo_and_wc(self, create_wc, read_only)
+ self._is_built = True
def add_test_path(self, path, remove=True):
self.test_paths.append(path)
@@ -155,7 +152,7 @@ class Sandbox:
sbox.cleanup_test_paths()
# cleanup all test specific working copies and repositories
for path in self.test_paths:
- if not path is svntest.main.pristine_dir:
+ if not path is svntest.main.pristine_greek_repos_dir:
_cleanup_test_path(path)
def is_built(self):
Modified: subversion/branches/atomic-revprop/subversion/tests/cmdline/switch_tests.py
URL: http://svn.apache.org/viewvc/subversion/branches/atomic-revprop/subversion/tests/cmdline/switch_tests.py?rev=983275&r1=983274&r2=983275&view=diff
==============================================================================
--- subversion/branches/atomic-revprop/subversion/tests/cmdline/switch_tests.py (original)
+++ subversion/branches/atomic-revprop/subversion/tests/cmdline/switch_tests.py Sat Aug 7 18:13:11 2010
@@ -2476,6 +2476,8 @@ j = os.path.join
def tree_conflicts_on_switch_1_1(sbox):
"tree conflicts 1.1: tree del, leaf edit on switch"
+ sbox.build()
+
# use case 1, as in notes/tree-conflicts/use-cases.txt
# 1.1) local tree delete, incoming leaf edit
@@ -2493,6 +2495,10 @@ def tree_conflicts_on_switch_1_1(sbox):
})
expected_disk = disk_empty_dirs.copy()
+ if svntest.main.wc_is_singledb(sbox.wc_dir):
+ expected_disk.remove('D/D1', 'DF/D1', 'DD/D1', 'DD/D1/D2',
+ 'DDF/D1', 'DDF/D1/D2',
+ 'DDD/D1', 'DDD/D1/D2', 'DDD/D1/D2/D3')
# The files delta, epsilon, and zeta are incoming additions, but since
# they are all within locally deleted trees they should also be schedule
@@ -2560,6 +2566,8 @@ def tree_conflicts_on_switch_1_1(sbox):
def tree_conflicts_on_switch_1_2(sbox):
"tree conflicts 1.2: tree del, leaf del on switch"
+ sbox.build()
+
# 1.2) local tree delete, incoming leaf delete
expected_output = deep_trees_conflict_output.copy()
@@ -2599,6 +2607,10 @@ def tree_conflicts_on_switch_1_2(sbox):
expected_disk.remove('D/D1',
'DD/D1/D2',
'DDD/D1/D2/D3')
+ if svntest.main.wc_is_singledb(sbox.wc_dir):
+ expected_disk.remove('DF/D1', 'DD/D1',
+ 'DDF/D1', 'DDF/D1/D2',
+ 'DDD/D1', 'DDD/D1/D2')
expected_info = {
'F/alpha' : {
Modified: subversion/branches/atomic-revprop/subversion/tests/cmdline/update_tests.py
URL: http://svn.apache.org/viewvc/subversion/branches/atomic-revprop/subversion/tests/cmdline/update_tests.py?rev=983275&r1=983274&r2=983275&view=diff
==============================================================================
--- subversion/branches/atomic-revprop/subversion/tests/cmdline/update_tests.py (original)
+++ subversion/branches/atomic-revprop/subversion/tests/cmdline/update_tests.py Sat Aug 7 18:13:11 2010
@@ -4418,6 +4418,8 @@ def tree_conflicts_on_update_1_1(sbox):
# use case 1, as in notes/tree-conflicts/use-cases.txt
# 1.1) local tree delete, incoming leaf edit
+ sbox.build()
+
expected_output = deep_trees_conflict_output.copy()
expected_output.add({
'DDF/D1/D2' : Item(status='D '),
@@ -4432,6 +4434,10 @@ def tree_conflicts_on_update_1_1(sbox):
})
expected_disk = disk_empty_dirs.copy()
+ if svntest.main.wc_is_singledb(sbox.wc_dir):
+ expected_disk.remove('D/D1', 'DF/D1', 'DD/D1', 'DD/D1/D2',
+ 'DDF/D1', 'DDF/D1/D2',
+ 'DDD/D1', 'DDD/D1/D2', 'DDD/D1/D2/D3')
# The files delta, epsilon, and zeta are incoming additions, but since
# they are all within locally deleted trees they should also be schedule
@@ -4500,6 +4506,8 @@ def tree_conflicts_on_update_1_2(sbox):
# 1.2) local tree delete, incoming leaf delete
+ sbox.build()
+
expected_output = deep_trees_conflict_output.copy()
expected_output.add({
'DDD/D1/D2' : Item(status='D '),
@@ -4537,6 +4545,10 @@ def tree_conflicts_on_update_1_2(sbox):
expected_disk.remove('D/D1',
'DD/D1/D2',
'DDD/D1/D2/D3')
+ if svntest.main.wc_is_singledb(sbox.wc_dir):
+ expected_disk.remove('DF/D1', 'DD/D1',
+ 'DDF/D1', 'DDF/D1/D2',
+ 'DDD/D1', 'DDD/D1/D2')
expected_info = {
'F/alpha' : {