subversion-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From pbu...@apache.org
Subject svn commit: r1425065 - in /subversion/trunk/subversion/tests/cmdline: merge_reintegrate_tests.py merge_tests.py
Date Fri, 21 Dec 2012 18:09:46 GMT
Author: pburba
Date: Fri Dec 21 18:09:45 2012
New Revision: 1425065

URL: http://svn.apache.org/viewvc?rev=1425065&view=rev
Log:
Follow-up to r1424469, revert to previous test expectations and set
tests to XFail.

See http://svn.haxx.se/dev/archive-2012-12/0475.shtml 

* subversion/tests/cmdline/merge_reintegrate_tests.py
  (reintegrate_on_shallow_wc): 
* subversion/tests/cmdline/merge_tests.py
  (merge_to_sparse_directories):
   Adjust to r1424468 expectations, set to XFail, and add explanatory
   comments. 

Modified:
    subversion/trunk/subversion/tests/cmdline/merge_reintegrate_tests.py
    subversion/trunk/subversion/tests/cmdline/merge_tests.py

Modified: subversion/trunk/subversion/tests/cmdline/merge_reintegrate_tests.py
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/tests/cmdline/merge_reintegrate_tests.py?rev=1425065&r1=1425064&r2=1425065&view=diff
==============================================================================
--- subversion/trunk/subversion/tests/cmdline/merge_reintegrate_tests.py (original)
+++ subversion/trunk/subversion/tests/cmdline/merge_reintegrate_tests.py Fri Dec 21 18:09:45
2012
@@ -740,6 +740,7 @@ def reintegrate_fail_on_switched_wc(sbox
 # Test for issue #3603 'allow reintegrate merges into WCs with
 # missing subtrees'.
 @Issue(3603)
+@XFail()
 def reintegrate_on_shallow_wc(sbox):
   "merge --reintegrate in shallow wc"
 
@@ -825,6 +826,18 @@ def reintegrate_on_shallow_wc(sbox):
                        'Some more work on the A_COPY branch', wc_dir)
   # Reuse the same expectations as the prior merge, except for the mergeinfo
   # on the target root that now includes the latest rev on the branch.
+  expected_mergeinfo_output.add({
+      'D' : Item(status=' U')
+      })
+  expected_A_status.tweak('D', status=' M')
+  expected_A_disk.tweak('D', props={SVN_PROP_MERGEINFO : '/A_COPY/D:2-4*'})
+  # ... a depth-restricted item is skipped ...
+  expected_A_skip.add({
+      'D/H' : Item()
+  })
+  # Currently this fails due to r1424469.  For a full explanation see
+  # http://svn.haxx.se/dev/archive-2012-12/0472.shtml
+  # and http://svn.haxx.se/dev/archive-2012-12/0475.shtml
   expected_A_disk.tweak('', props={SVN_PROP_MERGEINFO : '/A_COPY:2-4'})
   svntest.actions.run_and_verify_merge(A_path, None, None,
                                        sbox.repo_url + '/A_COPY', None,

Modified: subversion/trunk/subversion/tests/cmdline/merge_tests.py
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/tests/cmdline/merge_tests.py?rev=1425065&r1=1425064&r2=1425065&view=diff
==============================================================================
--- subversion/trunk/subversion/tests/cmdline/merge_tests.py (original)
+++ subversion/trunk/subversion/tests/cmdline/merge_tests.py Fri Dec 21 18:09:45 2012
@@ -7731,6 +7731,7 @@ def merge_away_subtrees_noninheritable_r
 # Handle merge info for sparsely-populated directories
 @Issue(2827)
 @SkipUnless(server_has_mergeinfo)
+@XFail()
 def merge_to_sparse_directories(sbox):
   "merge to sparse directories"
 
@@ -7812,10 +7813,14 @@ def merge_to_sparse_directories(sbox):
   # Merge r4:9 into the immediates WC.
   # The root of the immediates WC should get inheritable r4:9 as should
   # the one file present 'mu'.  The three directory children present, 'B',
-  # 'C', and 'D' are checked out at depth empty; the one of these affected
-  # by the merge, 'D', gets non-inheritable mergeinfo for r4:9.
+  # 'C', and 'D' are checked out at depth empty; the two of these affected
+  # by the merge, 'B' and 'D', get non-inheritable mergeinfo for r4:9.
   # The root and 'D' do should also get the changes
   # that affect them directly (the prop adds from r8 and r9).
+  #
+  # Currently this fails due to r1424469.  For a full explanation see
+  # http://svn.haxx.se/dev/archive-2012-12/0472.shtml
+  # and http://svn.haxx.se/dev/archive-2012-12/0475.shtml
   expected_output = wc.State(immediates_dir, {
     'D'   : Item(status=' U'),
     'mu'  : Item(status='U '),
@@ -7823,14 +7828,14 @@ def merge_to_sparse_directories(sbox):
     })
   expected_mergeinfo_output = wc.State(immediates_dir, {
     ''  : Item(status=' U'),
+    'B' : Item(status=' U'),
     'D' : Item(status=' U'),
     })
   expected_elision_output = wc.State(immediates_dir, {
-    'D' : Item(status=' U'),
     })
   expected_status = wc.State(immediates_dir, {
     ''          : Item(status=' M', wc_rev=9),
-    'B'         : Item(status='  ', wc_rev=9),
+    'B'         : Item(status=' M', wc_rev=9),
     'mu'        : Item(status='M ', wc_rev=9),
     'C'         : Item(status='  ', wc_rev=9),
     'D'         : Item(status=' M', wc_rev=9),
@@ -7838,10 +7843,15 @@ def merge_to_sparse_directories(sbox):
   expected_disk = wc.State('', {
     ''          : Item(props={SVN_PROP_MERGEINFO : '/A:5-9',
                               "prop:name" : "propval"}),
-    'B'         : Item(),
+    'B'         : Item(props={SVN_PROP_MERGEINFO : '/A/B:5-9*'}),
     'mu'        : Item("New content"),
     'C'         : Item(),
-    'D'         : Item(props={"prop:name" : "propval"}),
+    'D'         : Item(props={SVN_PROP_MERGEINFO : '/A/D:5-9*',
+                              "prop:name" : "propval"}),
+    })
+  expected_skip = svntest.wc.State(immediates_dir, {
+    'D/H'               : Item(),
+    'B/E'               : Item(),
     })
   expected_skip = svntest.wc.State(immediates_dir, {
     })



Mime
View raw message