You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@subversion.apache.org by ju...@apache.org on 2022/03/10 11:32:56 UTC
svn commit: r1898820 - in /subversion/branches/pristines-on-demand-on-mwf: ./ subversion/bindings/javahl/tests/org/apache/subversion/javahl/BasicTests.java subversion/tests/cmdline/svntest/actions.py subversion/tests/cmdline/upgrade_tests.py
Author: julianfoad
Date: Thu Mar 10 11:32:56 2022
New Revision: 1898820
URL: http://svn.apache.org/viewvc?rev=1898820&view=rev
Log:
On the 'pristines-on-demand-on-mwf': sync with trunk@1898819.
Modified:
subversion/branches/pristines-on-demand-on-mwf/ (props changed)
subversion/branches/pristines-on-demand-on-mwf/subversion/bindings/javahl/tests/org/apache/subversion/javahl/BasicTests.java
subversion/branches/pristines-on-demand-on-mwf/subversion/tests/cmdline/svntest/actions.py
subversion/branches/pristines-on-demand-on-mwf/subversion/tests/cmdline/upgrade_tests.py
Propchange: subversion/branches/pristines-on-demand-on-mwf/
------------------------------------------------------------------------------
Merged /subversion/trunk:r1898537-1898731,1898733-1898819
Modified: subversion/branches/pristines-on-demand-on-mwf/subversion/bindings/javahl/tests/org/apache/subversion/javahl/BasicTests.java
URL: http://svn.apache.org/viewvc/subversion/branches/pristines-on-demand-on-mwf/subversion/bindings/javahl/tests/org/apache/subversion/javahl/BasicTests.java?rev=1898820&r1=1898819&r2=1898820&view=diff
==============================================================================
--- subversion/branches/pristines-on-demand-on-mwf/subversion/bindings/javahl/tests/org/apache/subversion/javahl/BasicTests.java (original)
+++ subversion/branches/pristines-on-demand-on-mwf/subversion/bindings/javahl/tests/org/apache/subversion/javahl/BasicTests.java Thu Mar 10 11:32:56 2022
@@ -4676,7 +4676,20 @@ public class BasicTests extends SVNTests
// RuntimeException("Test exception") is expected here
}
- tunnelAgent.joinAndTest();
+ // In this test, there is a race condition that sometimes results in
+ // IOException when 'WAIT_TUNNEL' tries to read from a pipe that
+ // already has its read end closed. This is not an error, but
+ // it's hard to distinguish this case from other IOException which
+ // indicate a problem. To reproduce, simply wrap this test's body in
+ // a loop. The workaround is to ignore any detected IOException.
+ try
+ {
+ tunnelAgent.join();
+ }
+ catch (InterruptedException e)
+ {
+ e.printStackTrace();
+ }
}
/**
Modified: subversion/branches/pristines-on-demand-on-mwf/subversion/tests/cmdline/svntest/actions.py
URL: http://svn.apache.org/viewvc/subversion/branches/pristines-on-demand-on-mwf/subversion/tests/cmdline/svntest/actions.py?rev=1898820&r1=1898819&r2=1898820&view=diff
==============================================================================
--- subversion/branches/pristines-on-demand-on-mwf/subversion/tests/cmdline/svntest/actions.py (original)
+++ subversion/branches/pristines-on-demand-on-mwf/subversion/tests/cmdline/svntest/actions.py Thu Mar 10 11:32:56 2022
@@ -2135,11 +2135,7 @@ def disable_revprop_changes(repo_dir):
'import sys\n'
'sys.stderr.write("pre-revprop-change %s" %'
' " ".join(sys.argv[2:]))\n'
- 'sys.exit(1)\n',
- cmd_alternative=
- '@shift\n'
- '@echo pre-revprop-change %* 1>&2\n'
- '@exit 1\n')
+ 'sys.exit(1)\n')
def create_failing_post_commit_hook(repo_dir):
"""Create a post-commit hook script in the repository at REPO_DIR that always
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=1898820&r1=1898819&r2=1898820&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 Thu Mar 10 11:32:56 2022
@@ -283,6 +283,14 @@ def basic_upgrade(sbox):
svntest.actions.run_and_verify_svn(None, not_wc % 'A',
'upgrade', sbox.ospath('A'))
+ # Upgrading to a future version gives an error
+ expected_stderr = 'svn: E200007: Cannot guarantee working copy compatibility' \
+ ' with the requested version.*3[.]0'
+ svntest.actions.run_and_verify_svn(None, expected_stderr,
+ sbox.wc_dir, 'upgrade',
+ '--compatible-version',
+ '3.0')
+
# Now upgrade the working copy
svntest.actions.run_and_verify_svn(None, [],
'upgrade', sbox.wc_dir)