[ I'm only talking about the ra_serf tests in this email ]

When I build the atomic-revprop branch against serf r1408, I see that:

* diff_tests 24 29 (and many others [1]) fail with HEAD of the branch.
    (IIRC these two failures persist if I switch to serf ^/branches/0....@head.)
* diff_tests 24 29 fail with r983269 reverted. (test output attached)
* diff_tests pass with r983269 and r983225 reverted. [2]
* diff_tests 24 29 fail with a working copy @r983225.

Complication:

* All tests passed at the time I committed r983225, using unknown version
  of serf (possibly trunk-as-of-then).  I'm sure of this because that
  revision touches nothing except libsvn_ra_serf, and because I believe
  I did run 'make check' before committing it.

Question:

* It seems suspicious to me that a working copy at r983225 passed tests
  when that revision was youngest, but doesn't pass tests now.  Does
  anyone see from this what might be causing the failures?

Thanks,

Daniel
(if no one sees why, I'll revert and rewrite r983225 and r983269; but
I hope someone here could save me some work...)

[1] List here: 
http://svn.apache.org/repos/asf/subversion/branches/atomic-revprop/FAILING-TESTS
    Outputs here: 
http://ci.apache.org/builders/svn-slik-w2k3-x64-ra/builds/761/steps/Test%20fsfs%2Bserf/logs/faillog

[2] http://svn.apache.org/viewvc?view=revision&revision=983225
    http://svn.apache.org/viewvc?view=revision&revision=983269
Traceback (most recent call last):
  File 
"/home/daniel/src/svn/atomic-revprop3/subversion/tests/cmdline/svntest/main.py",
 line 1218, in run
    rc = self.pred.run(sandbox)
  File 
"/home/daniel/src/svn/atomic-revprop3/subversion/tests/cmdline/svntest/testcase.py",
 line 170, in run
    return self.func(sandbox)
  File "./diff_tests.py", line 1741, in diff_prop_on_named_dir
    verify_expected_output(diff_output, "-v")
  File "./diff_tests.py", line 215, in verify_expected_output
    raise svntest.Failure
Failure
FAIL:  diff_tests.py 24: diff a prop change on a dir named explicitly
EXPECTED STDOUT (unordered):
Index: A
===================================================================
--- A   (revision 2)
+++ A   (revision 1)

Property changes on: A
___________________________________________________________________
Deleted: dirprop
## -1 +0,0 ##
-r2value
Index: iota
===================================================================
--- iota        (revision 2)
+++ iota        (revision 1)
Property changes on: iota
___________________________________________________________________
Deleted: fileprop
## -1 +0,0 ##
-r2value
ACTUAL STDOUT:
Index: iota
===================================================================
--- iota        (revision 2)
+++ iota        (revision 1)

Property changes on: iota
___________________________________________________________________
Deleted: fileprop
## -1 +0,0 ##
-r2value
DIFF STDOUT (unordered):
--- EXPECTED STDOUT 
+++ ACTUAL STDOUT 
@@ -1,17 +1,8 @@
-Index: A
-===================================================================
---- A  (revision 2)
-+++ A  (revision 1)
-
-Property changes on: A
-___________________________________________________________________
-Deleted: dirprop
-## -1 +0,0 ##
--r2value
 Index: iota
 ===================================================================
 --- iota       (revision 2)
 +++ iota       (revision 1)
+
 Property changes on: iota
 ___________________________________________________________________
 Deleted: fileprop
EXCEPTION: SVNLineUnequal
Traceback (most recent call last):
  File 
"/home/daniel/src/svn/atomic-revprop3/subversion/tests/cmdline/svntest/main.py",
 line 1218, in run
    rc = self.pred.run(sandbox)
  File 
"/home/daniel/src/svn/atomic-revprop3/subversion/tests/cmdline/svntest/testcase.py",
 line 170, in run
    return self.func(sandbox)
  File "./diff_tests.py", line 2095, in diff_property_changes_to_base
    'diff', '-r', '2:1')
  File 
"/home/daniel/src/svn/atomic-revprop3/subversion/tests/cmdline/svntest/actions.py",
 line 262, in run_and_verify_svn
    expected_exit, *varargs)
  File 
"/home/daniel/src/svn/atomic-revprop3/subversion/tests/cmdline/svntest/actions.py",
 line 301, in run_and_verify_svn2
    verify.verify_outputs(message, out, err, expected_stdout, expected_stderr)
  File 
"/home/daniel/src/svn/atomic-revprop3/subversion/tests/cmdline/svntest/verify.py",
 line 357, in verify_outputs
    compare_and_display_lines(message, label, expected, actual, raisable)
  File 
"/home/daniel/src/svn/atomic-revprop3/subversion/tests/cmdline/svntest/verify.py",
 line 330, in compare_and_display_lines
    raise raisable
SVNLineUnequal
FAIL:  diff_tests.py 29: diff to BASE with local property mods

Reply via email to