svn commit: r1841743 - /subversion/trunk/subversion/tests/cmdline/tree_conflict_tests.py

[st...@apache.org]

Author: stsp
Date: Sun Sep 23 11:08:18 2018
New Revision: 1841743

URL: http://svn.apache.org/viewvc?rev=1841743&view=rev
Log:
Follow-up to r1841736:

* subversion/tests/cmdline/tree_conflict_tests.py
  (local_missing_dir_endless_loop): Restore trailing newline in file content.
   Use main.file_append_binary() to avoid newline translation on Windows.

Suggested by: brane

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

Modified: subversion/trunk/subversion/tests/cmdline/tree_conflict_tests.py
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/tests/cmdline/tree_conflict_tests.py?rev=1841743&r1=1841742&r2=1841743&view=diff
==============================================================================
--- subversion/trunk/subversion/tests/cmdline/tree_conflict_tests.py (original)
+++ subversion/trunk/subversion/tests/cmdline/tree_conflict_tests.py Sun Sep 23 11:08:18 2018
@@ -1518,7 +1518,7 @@ def local_missing_dir_endless_loop(sbox)
   sbox.simple_move('A/B', 'A/B2')
   sbox.simple_commit()
   sbox.simple_update()
-  main.file_append(sbox.ospath("A/B2/lambda"), "This is more content.")
+  main.file_append_binary(sbox.ospath("A/B2/lambda"), "This is more content.\n")
   sbox.simple_commit()
   sbox.simple_update()
 
@@ -1544,7 +1544,7 @@ interactive-conflicts = true
   contents = open(sbox.ospath('A1/B/lambda'), 'rb').readlines()
   svntest.verify.compare_and_display_lines(
     "A1/B/lambda has unexpectected contents", sbox.ospath("A1/B/lambda"),
-    [ "This is the file 'lambda'.\n", "This is more content."], contents)
+    [ "This is the file 'lambda'.\n", "This is more content.\n"], contents)
 
 
 #######################################################################