svn commit: r1706626 - /subversion/trunk/subversion/tests/cmdline/patch_tests.py

[rh...@apache.org]

Author: rhuijben
Date: Sat Oct  3 20:51:39 2015
New Revision: 1706626

URL: http://svn.apache.org/viewvc?rev=1706626&view=rev
Log:
Following up on r1706598, resolve testfailure on systems with a '\n' native
end of line.

* subversion/tests/cmdline/patch_tests.py
  (patch_with_properties): Write patch file as binary to have the same test
    results on Windows as on other platforms. Update expected result.

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=1706626&r1=1706625&r2=1706626&view=diff
==============================================================================
--- subversion/trunk/subversion/tests/cmdline/patch_tests.py (original)
+++ subversion/trunk/subversion/tests/cmdline/patch_tests.py Sat Oct  3 20:51:39 2015
@@ -2225,7 +2225,7 @@ def patch_with_properties(sbox):
     "-This is the property 'deleted'.\n",
   ]
 
-  svntest.main.file_write(patch_file_path, ''.join(unidiff_patch))
+  svntest.main.file_write(patch_file_path, ''.join(unidiff_patch), 'wb')
 
   modified_prop_contents = "The property 'modified' has changed.\n"
   added_prop_contents = "This is the property 'added'.\n"
@@ -2261,6 +2261,7 @@ def patch_with_properties(sbox):
 
   # Reverse
   expected_output.tweak('iota', status=' U')
+  expected_status.tweak('iota', status='  ')
   expected_disk.tweak('iota',
                       props={'deleted': "This is the property 'deleted'.\n",
                              'modified': "This is the property 'modified'.\n"})