svn commit: r1128307 - /subversion/trunk/subversion/tests/cmdline/revert_tests.py

[ph...@apache.org]

Author: philip
Date: Fri May 27 13:56:03 2011
New Revision: 1128307

URL: http://svn.apache.org/viewvc?rev=1128307&view=rev
Log:
Try to make revert_tests.py XFAIL, as it should, on Windows.

* subversion/tests/cmdline/revert_tests.py
  (create_no_text_conflict): Read the original r1 content rather than
   hard-coding it.

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

Modified: subversion/trunk/subversion/tests/cmdline/revert_tests.py
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/tests/cmdline/revert_tests.py?rev=1128307&r1=1128306&r2=1128307&view=diff
==============================================================================
--- subversion/trunk/subversion/tests/cmdline/revert_tests.py (original)
+++ subversion/trunk/subversion/tests/cmdline/revert_tests.py Fri May 27 13:56:03 2011
@@ -1498,6 +1498,7 @@ def create_no_text_change_conflict(sbox)
   sbox.build()
   wc_dir = sbox.wc_dir
 
+  r1_content = open(sbox.ospath('A/B/E/alpha'), 'r').read()
   svntest.main.file_append(sbox.ospath('A/B/E/alpha'), 'their text\n')
   sbox.simple_commit()
   sbox.simple_update()
@@ -1513,8 +1514,7 @@ def create_no_text_change_conflict(sbox)
 
   # Reset the text with the file still marked as a conflict
   os.remove(sbox.ospath('A/B/E/alpha'))
-  svntest.main.file_append(sbox.ospath('A/B/E/alpha'),
-                           "This is the file 'alpha'.\n")
+  svntest.main.file_append(sbox.ospath('A/B/E/alpha'), r1_content)
 
 @XFail()
 @Issue(3859)