subversion-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From s...@apache.org
Subject svn commit: r1207823 - /subversion/trunk/subversion/tests/cmdline/patch_tests.py
Date Tue, 29 Nov 2011 11:10:44 GMT
Author: stsp
Date: Tue Nov 29 11:10:43 2011
New Revision: 1207823

URL: http://svn.apache.org/viewvc?rev=1207823&view=rev
Log:
* subversion/tests/cmdline/patch_tests.py
  (patch_target_no_eol_at_eof): Make sure the patch changes the target file's
    size so that 'svn status' realises the file has been modified even if
    it runs within the sleep-for-timestamps window. Should fix spurious test
    failures on the buildbots.

Suggested by: philip
              rhuijben

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

Modified: subversion/trunk/subversion/tests/cmdline/patch_tests.py
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/tests/cmdline/patch_tests.py?rev=1207823&r1=1207822&r2=1207823&view=diff
==============================================================================
--- subversion/trunk/subversion/tests/cmdline/patch_tests.py (original)
+++ subversion/trunk/subversion/tests/cmdline/patch_tests.py Tue Nov 29 11:10:43 2011
@@ -4015,14 +4015,14 @@ def patch_target_no_eol_at_eof(sbox):
     "@@ -1,7 +1,7 @@\n",
     "-This is the file iota.\n"
     "\\ No newline at end of file\n",
-    "+It is the file 'iota'.\n",
+    "+It is really the file 'iota'.\n",
     "\\ No newline at end of file\n",
   ]
 
   svntest.main.file_write(patch_file_path, ''.join(unidiff_patch))
 
   iota_contents = [
-    "It is the file 'iota'."
+    "It is really the file 'iota'."
   ]
   expected_output = [
     'U         %s\n' % os.path.join(wc_dir, 'iota'),



Mime
View raw message