subversion-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From s...@apache.org
Subject svn commit: r1667234 - /subversion/trunk/subversion/tests/libsvn_wc/conflict-data-test.c
Date Tue, 17 Mar 2015 10:17:27 GMT
Author: stsp
Date: Tue Mar 17 10:17:27 2015
New Revision: 1667234

URL: http://svn.apache.org/r1667234
Log:
* subversion/tests/libsvn_wc/conflict-data-test.c
  (test_binary_file_conflict): Ensure that file size changes when
   the binary file is changed. Makes sleep for timestamp unnecessary.

Suggested by: rhuijben

Modified:
    subversion/trunk/subversion/tests/libsvn_wc/conflict-data-test.c

Modified: subversion/trunk/subversion/tests/libsvn_wc/conflict-data-test.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/tests/libsvn_wc/conflict-data-test.c?rev=1667234&r1=1667233&r2=1667234&view=diff
==============================================================================
--- subversion/trunk/subversion/tests/libsvn_wc/conflict-data-test.c (original)
+++ subversion/trunk/subversion/tests/libsvn_wc/conflict-data-test.c Tue Mar 17 10:17:27 2015
@@ -918,12 +918,10 @@ test_binary_file_conflict(const svn_test
   const apr_array_header_t *conflicts;
   svn_wc_conflict_description2_t *desc;
 
-  svn_test__enable_sleep_for_timestamps(pool);
-
   SVN_ERR(svn_test__sandbox_create(&sbox, "test_binary_file_conflict", opts, pool));
 
   /* Create and add a binary file. */
-  SVN_ERR(sbox_file_write(&sbox, "binary-file", "\xff\xff\xff\xff\xff\xff"));
+  SVN_ERR(sbox_file_write(&sbox, "binary-file", "\xff\xff"));
   SVN_ERR(sbox_wc_add(&sbox, "binary-file"));
   SVN_ERR(sbox_wc_propset(&sbox, SVN_PROP_MIME_TYPE,
                           "application/octet-stream", "binary-file"));
@@ -935,7 +933,7 @@ test_binary_file_conflict(const svn_test
 
   /* Update back to r1, make a conflicting change to binary file. */
   SVN_ERR(sbox_wc_update(&sbox, "binary-file", 1));
-  SVN_ERR(sbox_file_write(&sbox, "binary-file", "\xfd\xfd\xfd\xfd\xfd\xfd"));
+  SVN_ERR(sbox_file_write(&sbox, "binary-file", "\xfd\xfd\xfd\xfd"));
 
   /* Update to HEAD and ensure the conflict is marked as binary. */
   SVN_ERR(sbox_wc_update(&sbox, "binary-file", 2));
@@ -947,8 +945,6 @@ test_binary_file_conflict(const svn_test
   desc = APR_ARRAY_IDX(conflicts, 0, svn_wc_conflict_description2_t *);
   SVN_TEST_ASSERT(desc->is_binary);
 
-  svn_test__disable_sleep_for_timestamps(pool);
-
   return SVN_NO_ERROR;
 }
 



Mime
View raw message