Author: danielsh
Date: Tue Mar 15 23:09:26 2022
New Revision: 1898953
URL: http://svn.apache.org/viewvc?rev=1898953&view=rev
Log:
On the pristines-on-demand-on-mwf branch:
Follow-up to r1898538.
* subversion/tests/cmdline/upgrade_tests.py
(check_pristine): Don't catch unexpected exceptions.
Modified:
subversion/branches/pristines-on-demand-on-mwf/subversion/tests/cmdline/upgrade_tests.py
Modified:
subversion/branches/pristines-on-demand-on-mwf/subversion/tests/cmdline/upgrade_tests.py
URL:
http://svn.apache.org/viewvc/subversion/branches/pristines-on-demand-on-mwf/subversion/tests/cmdline/upgrade_tests.py?rev=1898953&r1=1898952&r2=1898953&view=diff
==============================================================================
---
subversion/branches/pristines-on-demand-on-mwf/subversion/tests/cmdline/upgrade_tests.py
(original)
+++
subversion/branches/pristines-on-demand-on-mwf/subversion/tests/cmdline/upgrade_tests.py
Tue Mar 15 23:09:26 2022
@@ -116,7 +116,7 @@ def check_pristine(sbox, files):
file_text = open(file_path, 'r').read()
try:
file_pristine = open(svntest.wc.text_base_path(file_path), 'r').read()
- except:
+ except (FileNotFoundError, svntest.Failure): # FileNotFoundError
if expect_pristines_all_present(sbox):
raise
# Pristine missing; pristines optional so ignore it