svn commit: r1125177 - /subversion/trunk/subversion/tests/cmdline/special_tests.py

[rh...@apache.org]

Author: rhuijben
Date: Thu May 19 23:20:21 2011
New Revision: 1125177

URL: http://svn.apache.org/viewvc?rev=1125177&view=rev
Log:
* subversion/tests/cmdline/special_tests.py
  (replace_symlink_with_dir): Following up on r1125151, use a standard verify
    function to catch a segfault as an error, instead of as a passed test.
    (This would have caught issue #3892 more then a week ago)

Modified:
    subversion/trunk/subversion/tests/cmdline/special_tests.py

Modified: subversion/trunk/subversion/tests/cmdline/special_tests.py
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/tests/cmdline/special_tests.py?rev=1125177&r1=1125176&r2=1125177&view=diff
==============================================================================
--- subversion/trunk/subversion/tests/cmdline/special_tests.py (original)
+++ subversion/trunk/subversion/tests/cmdline/special_tests.py Thu May 19 23:20:21 2011
@@ -603,11 +603,10 @@ def replace_symlink_with_dir(sbox):
   # I'd expect a failed commit here, but replacing a file locally with a
   # directory seems to make svn think the file is unchanged.
   os.chdir(was_cwd)
-  exit_code, stdout_lines, stderr_lines = svntest.main.run_svn(1, 'ci', '-m',
-                                                               'log msg',
-                                                               wc_dir)
-  if not (stdout_lines == [] or stderr_lines == []):
-    raise svntest.Failure
+  expected_output = svntest.wc.State(wc_dir, {
+  })
+  svntest.actions.run_and_verify_commit(wc_dir, expected_output, 
+                                        None, None, wc_dir)
 
 # test for issue #1808: svn up deletes local symlink that obstructs
 # versioned file