Author: pburba
Date: Wed Apr 21 21:09:51 2010
New Revision: 936516
URL: http://svn.apache.org/viewvc?rev=936516&view=rev
Log:
Fix some bogus test data for tests of issue #2982, issue #3181, and
issue #3020.
* subversion/tests/cmdline/svndumpfilter_tests_data/with_merges.dump
Remove self-referential mergeinfo from this dump file. The dump file was
created with a pre-1.5.0 build which apparently was creating
self-referential mergeinfo on the destination of a copy. This was never
a behavior in an official release, so using it in our test suite makes
no sense.
* subversion/tests/cmdline/svnadmin_tests.py
(reflect_dropped_renumbered_revs):
* subversion/tests/cmdline/svndumpfilter_tests.py
(reflect_dropped_renumbered_revs):
(svndumpfilter_loses_mergeinfo):
Adjust these tests' so they no longer expect self-referential mergeinfo
resulting from copies. Also make the check of expected mergeinfo more
robust by asking for all the mergeinfo in the repository recursively,
rather than propget(ing) single paths.
Modified:
subversion/trunk/subversion/tests/cmdline/svnadmin_tests.py
subversion/trunk/subversion/tests/cmdline/svndumpfilter_tests.py
subversion/trunk/subversion/tests/cmdline/svndumpfilter_tests_data/with_merges.dump
Modified: subversion/trunk/subversion/tests/cmdline/svnadmin_tests.py
URL:
http://svn.apache.org/viewvc/subversion/trunk/subversion/tests/cmdline/svnadmin_tests.py?rev=936516&r1=936515&r2=936516&view=diff
==============================================================================
--- subversion/trunk/subversion/tests/cmdline/svnadmin_tests.py (original)
+++ subversion/trunk/subversion/tests/cmdline/svnadmin_tests.py Wed Apr 21
21:09:51 2010
@@ -813,28 +813,14 @@ def reflect_dropped_renumbered_revs(sbox
'/toplevel')
# Verify the svn:mergeinfo properties
- #
- # Currently this test is set as XFail because we needed to revert
- # http://svn.apache.org/viewvc?view=revision&revision=927243,
- # see http://svn.haxx.se/dev/archive-2010-04/0475.shtml.
- svntest.actions.run_and_verify_svn(None, ["/trunk:2-4\n"],
- [], 'propget', 'svn:mergeinfo',
- sbox.repo_url + '/branch2')
- svntest.actions.run_and_verify_svn(None, ["/branch1:5-9\n"],
- [], 'propget', 'svn:mergeinfo',
- sbox.repo_url + '/trunk')
- svntest.actions.run_and_verify_svn(None, ["/toplevel/trunk:11-13\n"],
- [], 'propget', 'svn:mergeinfo',
- sbox.repo_url + '/toplevel/branch2')
- svntest.actions.run_and_verify_svn(None, ["/toplevel/branch1:14-18\n"],
- [], 'propget', 'svn:mergeinfo',
- sbox.repo_url + '/toplevel/trunk')
- svntest.actions.run_and_verify_svn(None, ["/toplevel/trunk:11-12\n"],
- [], 'propget', 'svn:mergeinfo',
- sbox.repo_url + '/toplevel/branch1')
- svntest.actions.run_and_verify_svn(None, ["/trunk:2-3\n"],
- [], 'propget', 'svn:mergeinfo',
- sbox.repo_url + '/branch1')
+ url = sbox.repo_url
+ expected_output = svntest.verify.UnorderedOutput([
+ url + "/trunk - /branch1:5-9\n",
+ url + "/toplevel/trunk - /toplevel/branch1:14-18\n",
+ ])
+ svntest.actions.run_and_verify_svn(None, expected_output, [],
+ 'propget', 'svn:mergeinfo', '-R',
+ sbox.repo_url)
#----------------------------------------------------------------------
@@ -1236,7 +1222,7 @@ test_list = [ None,
SkipUnless(recover_fsfs, svntest.main.is_fs_type_fsfs),
load_with_parent_dir,
set_uuid,
- XFail(reflect_dropped_renumbered_revs),
+ reflect_dropped_renumbered_revs,
SkipUnless(fsfs_recover_handle_missing_revs_or_revprops_file,
svntest.main.is_fs_type_fsfs),
create_in_repo_subdir,
Modified: subversion/trunk/subversion/tests/cmdline/svndumpfilter_tests.py
URL:
http://svn.apache.org/viewvc/subversion/trunk/subversion/tests/cmdline/svndumpfilter_tests.py?rev=936516&r1=936515&r2=936516&view=diff
==============================================================================
--- subversion/trunk/subversion/tests/cmdline/svndumpfilter_tests.py (original)
+++ subversion/trunk/subversion/tests/cmdline/svndumpfilter_tests.py Wed Apr 21
21:09:51 2010
@@ -85,14 +85,14 @@ def reflect_dropped_renumbered_revs(sbox
"--ignore-uuid")
# Verify the svn:mergeinfo properties
- svntest.actions.run_and_verify_svn(None,
- [sbox.repo_url+"/trunk - /branch1:4-5\n"],
- [], 'propget', 'svn:mergeinfo', '-R',
- sbox.repo_url + '/trunk')
- svntest.actions.run_and_verify_svn(None,
- [sbox.repo_url+"/branch1 - /trunk:1-2\n"],
- [], 'propget', 'svn:mergeinfo', '-R',
- sbox.repo_url + '/branch1')
+ url = sbox.repo_url
+ expected_output = svntest.verify.UnorderedOutput([
+ url + "/trunk - /branch1:4-5\n",
+ ])
+ svntest.actions.run_and_verify_svn(None, expected_output, [],
+ 'propget', 'svn:mergeinfo', '-R',
+ sbox.repo_url)
+
# Test svndumpfilter with exclude option
test_create(sbox)
@@ -105,14 +105,12 @@ def reflect_dropped_renumbered_revs(sbox
"--ignore-uuid")
# Verify the svn:mergeinfo properties
- svntest.actions.run_and_verify_svn(None,
- [sbox.repo_url+"/trunk - \n"],
- [], 'propget', 'svn:mergeinfo', '-R',
- sbox.repo_url + '/trunk')
- svntest.actions.run_and_verify_svn(None,
- [sbox.repo_url+"/branch2 - /trunk:1-2\n"],
- [], 'propget', 'svn:mergeinfo', '-R',
- sbox.repo_url + '/branch2')
+ expected_output = svntest.verify.UnorderedOutput([
+ url + "/trunk - \n",
+ ])
+ svntest.actions.run_and_verify_svn(None, expected_output, [],
+ 'propget', 'svn:mergeinfo', '-R',
+ sbox.repo_url)
def svndumpfilter_loses_mergeinfo(sbox):
"svndumpfilter loses mergeinfo"
@@ -131,14 +129,13 @@ def svndumpfilter_loses_mergeinfo(sbox):
load_and_verify_dumpstream(sbox, [], [], None, filtered_out)
# Verify the svn:mergeinfo properties
- svntest.actions.run_and_verify_svn(None,
- [sbox.repo_url+"/trunk - /branch1:4-8\n"],
- [], 'propget', 'svn:mergeinfo', '-R',
- sbox.repo_url + '/trunk')
- svntest.actions.run_and_verify_svn(None,
- [sbox.repo_url+"/branch1 - /trunk:1-2\n"],
- [], 'propget', 'svn:mergeinfo', '-R',
- sbox.repo_url + '/branch1')
+ url = sbox.repo_url
+ expected_output = svntest.verify.UnorderedOutput([
+ url + "/trunk - /branch1:4-8\n",
+ ])
+ svntest.actions.run_and_verify_svn(None, expected_output, [],
+ 'propget', 'svn:mergeinfo', '-R',
+ sbox.repo_url)
def _simple_dumpfilter_test(sbox, dumpfile, *dumpargs):
Modified:
subversion/trunk/subversion/tests/cmdline/svndumpfilter_tests_data/with_merges.dump
URL:
http://svn.apache.org/viewvc/subversion/trunk/subversion/tests/cmdline/svndumpfilter_tests_data/with_merges.dump?rev=936516&r1=936515&r2=936516&view=diff
==============================================================================
---
subversion/trunk/subversion/tests/cmdline/svndumpfilter_tests_data/with_merges.dump
(original)
+++
subversion/trunk/subversion/tests/cmdline/svndumpfilter_tests_data/with_merges.dump
Wed Apr 21 21:09:51 2010
@@ -140,13 +140,9 @@ Node-kind: dir
Node-action: add
Node-copyfrom-rev: 2
Node-copyfrom-path: trunk
-Prop-content-length: 45
-Content-length: 45
+Prop-content-length: 10
+Content-length: 10
-K 13
-svn:mergeinfo
-V 10
-/trunk:1-2
PROPS-END
@@ -173,13 +169,9 @@ Node-kind: dir
Node-action: add
Node-copyfrom-rev: 3
Node-copyfrom-path: trunk
-Prop-content-length: 45
-Content-length: 45
+Prop-content-length: 10
+Content-length: 10
-K 13
-svn:mergeinfo
-V 10
-/trunk:1-3
PROPS-END
