Author: julianfoad
Date: Wed Mar  2 14:17:01 2022
New Revision: 1898529

URL: http://svn.apache.org/viewvc?rev=1898529&view=rev
Log:
On the 'pristines-on-demand-on-mwf' branch: fix disabled tests.

* subversion/tests/cmdline/update_tests.py
  (missing_tmp_update): Re-enable. Allow error message variations.
    Old error:
      svn: E000002: Unable to create pristine install stream
      svn: E000002: Can't create temporary file from template '...': No such 
file or directory
    New error:
      svn: E000002: Can't create temporary file from template '...': No such 
file or directory

Modified:
    
subversion/branches/pristines-on-demand-on-mwf/subversion/tests/cmdline/update_tests.py

Modified: 
subversion/branches/pristines-on-demand-on-mwf/subversion/tests/cmdline/update_tests.py
URL: 
http://svn.apache.org/viewvc/subversion/branches/pristines-on-demand-on-mwf/subversion/tests/cmdline/update_tests.py?rev=1898529&r1=1898528&r2=1898529&view=diff
==============================================================================
--- 
subversion/branches/pristines-on-demand-on-mwf/subversion/tests/cmdline/update_tests.py
 (original)
+++ 
subversion/branches/pristines-on-demand-on-mwf/subversion/tests/cmdline/update_tests.py
 Wed Mar  2 14:17:01 2022
@@ -6782,7 +6782,6 @@ def update_add_conflicted_deep(sbox):
   # This final update used to segfault using 1.9.0 and 1.9.1
   sbox.simple_update('A/z/z', 3)
 
-@Wimp("The error message has changed")
 def missing_tmp_update(sbox):
   "missing tmp update caused segfault"
 
@@ -6793,7 +6792,7 @@ def missing_tmp_update(sbox):
 
   os.rmdir(sbox.ospath(svntest.main.get_admin_name() + '/tmp'))
 
-  svntest.actions.run_and_verify_svn(None, '.*Unable to create.*',
+  svntest.actions.run_and_verify_svn(None, ".*(Unable to create|Can't 
create).*",
                                      'up', wc_dir, '--set-depth', 'infinity')
 
   # This re-creates .svn/tmp as a side-effect.


Reply via email to