subversion-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From julianf...@apache.org
Subject svn commit: r1833530 - /subversion/trunk/subversion/tests/cmdline/shelf_tests.py
Date Thu, 14 Jun 2018 17:15:44 GMT
Author: julianfoad
Date: Thu Jun 14 17:15:43 2018
New Revision: 1833530

URL: http://svn.apache.org/viewvc?rev=1833530&view=rev
Log:
Revert r1833512 (change shelf_tests.py binary data tests to use varying file lengths).

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

Modified: subversion/trunk/subversion/tests/cmdline/shelf_tests.py
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/tests/cmdline/shelf_tests.py?rev=1833530&r1=1833529&r2=1833530&view=diff
==============================================================================
--- subversion/trunk/subversion/tests/cmdline/shelf_tests.py (original)
+++ subversion/trunk/subversion/tests/cmdline/shelf_tests.py Thu Jun 14 17:15:43 2018
@@ -355,7 +355,7 @@ def unshelve_refuses_if_conflicts(sbox):
 
 #----------------------------------------------------------------------
 
-#@Skip()  # fails on MacOSX; unknown reason, maybe related to global state
+@Skip()  # fails on MacOSX; unknown reason, maybe related to global state
 def shelve_binary_file_mod(sbox):
   "shelve binary file mod"
 
@@ -371,7 +371,7 @@ def shelve_binary_file_mod(sbox):
 
   def modifier(sbox):
     for f in mod_files:
-      sbox.simple_append(f, '\6\5\4\3\2\1\0', truncate=True)
+      sbox.simple_append(f, '\5\4\3\2\1\0', truncate=True)
 
   shelve_unshelve(sbox, modifier)
 
@@ -435,7 +435,7 @@ def shelve_binary_file_replace(sbox):
   def modifier(sbox):
     for f in mod_files:
       sbox.simple_rm(f)
-      sbox.simple_add_text('\6\5\4\3\2\1\0', f)
+      sbox.simple_add_text('\5\4\3\2\1\0', f)
 
   shelve_unshelve(sbox, modifier)
 
@@ -752,8 +752,8 @@ def unshelve_undeclared_binary_mod_confl
   "unshelve undeclared binary mod conflict"
 
   orig_contents='\1\2\3\4\5'
-  mod1_contents='\1\2\2\3\4\5'
-  mod2_contents='\1\2\3\4\3\4\5'
+  mod1_contents='\1\6\3\4\5'
+  mod2_contents='\1\7\3\4\5'
   merged_contents = '<<<<<<< .working\n' + mod2_contents + '|||||||
.merge-left\n' + orig_contents + '=======\n' + mod1_contents + '>>>>>>>
.merge-right\n'
 
   def setup(sbox):
@@ -782,8 +782,8 @@ def unshelve_binary_mod_conflict(sbox):
   "unshelve binary mod conflict"
 
   orig_contents='\1\2\3\4\5'
-  mod1_contents='\1\2\2\3\4\5'
-  mod2_contents='\1\2\3\4\3\4\5'
+  mod1_contents='\1\6\3\4\5'
+  mod2_contents='\1\7\3\4\5'
 
   def setup(sbox):
     sbox.simple_append('A/mu', orig_contents, truncate=True)



Mime
View raw message