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 2019/10/24 15:26:12 UTC
svn commit: r1868883 - in /subversion/branches/1.13.x: ./ STATUS
subversion/tests/cmdline/svnadmin_tests.py
subversion/tests/cmdline/tree_conflict_tests.py
Author: julianfoad
Date: Thu Oct 24 15:26:12 2019
New Revision: 1868883
URL: http://svn.apache.org/viewvc?rev=1868883&view=rev
Log:
Merge r1868575 from trunk:
* r1868575
Fix false positive on test with Python 3
Justification:
Python 2 will reach EOL during the lifetime of this branch.
Votes:
+1: danielsh
+0: julianfoad (reviewed only)
Modified:
subversion/branches/1.13.x/ (props changed)
subversion/branches/1.13.x/STATUS
subversion/branches/1.13.x/subversion/tests/cmdline/svnadmin_tests.py
subversion/branches/1.13.x/subversion/tests/cmdline/tree_conflict_tests.py
Propchange: subversion/branches/1.13.x/
------------------------------------------------------------------------------
Merged /subversion/trunk:r1868575
Modified: subversion/branches/1.13.x/STATUS
URL: http://svn.apache.org/viewvc/subversion/branches/1.13.x/STATUS?rev=1868883&r1=1868882&r2=1868883&view=diff
==============================================================================
--- subversion/branches/1.13.x/STATUS (original)
+++ subversion/branches/1.13.x/STATUS Thu Oct 24 15:26:12 2019
@@ -22,11 +22,3 @@ Veto-blocked changes:
Approved changes:
=================
-
- * r1868575
- Fix false positive on test with Python 3
- Justification:
- Python 2 will reach EOL during the lifetime of this branch.
- Votes:
- +1: danielsh
- +0: julianfoad (reviewed only)
Modified: subversion/branches/1.13.x/subversion/tests/cmdline/svnadmin_tests.py
URL: http://svn.apache.org/viewvc/subversion/branches/1.13.x/subversion/tests/cmdline/svnadmin_tests.py?rev=1868883&r1=1868882&r2=1868883&view=diff
==============================================================================
--- subversion/branches/1.13.x/subversion/tests/cmdline/svnadmin_tests.py (original)
+++ subversion/branches/1.13.x/subversion/tests/cmdline/svnadmin_tests.py Thu Oct 24 15:26:12 2019
@@ -3859,7 +3859,7 @@ def dump_no_canonicalize_svndate(sbox):
sbox.repo_url)
dump_lines = svntest.actions.run_and_verify_dump(sbox.repo_dir)
- assert propval + '\n' in dump_lines
+ assert propval.encode() + b'\n' in dump_lines
def check_recover_prunes_rep_cache(sbox, enable_rep_sharing):
"""Check 'recover' prunes the rep-cache while enable-rep-sharing is
Modified: subversion/branches/1.13.x/subversion/tests/cmdline/tree_conflict_tests.py
URL: http://svn.apache.org/viewvc/subversion/branches/1.13.x/subversion/tests/cmdline/tree_conflict_tests.py?rev=1868883&r1=1868882&r2=1868883&view=diff
==============================================================================
--- subversion/branches/1.13.x/subversion/tests/cmdline/tree_conflict_tests.py (original)
+++ subversion/branches/1.13.x/subversion/tests/cmdline/tree_conflict_tests.py Thu Oct 24 15:26:12 2019
@@ -1518,7 +1518,7 @@ def local_missing_dir_endless_loop(sbox)
sbox.simple_move('A/B', 'A/B2')
sbox.simple_commit()
sbox.simple_update()
- main.file_append_binary(sbox.ospath("A/B2/lambda"), "This is more content.\n")
+ main.file_append(sbox.ospath("A/B2/lambda"), "This is more content.\n")
sbox.simple_commit()
sbox.simple_update()
@@ -1541,7 +1541,7 @@ interactive-conflicts = true
# If everything works as expected the resolver will recommended a
# resolution option and 'svn' will resolve the conflict automatically.
# Verify that 'A1/B/lambda' contains the merged content:
- contents = open(sbox.ospath('A1/B/lambda'), 'rb').readlines()
+ contents = open(sbox.ospath('A1/B/lambda'), 'r').readlines()
svntest.verify.compare_and_display_lines(
"A1/B/lambda has unexpectected contents", sbox.ospath("A1/B/lambda"),
[ "This is the file 'lambda'.\n", "This is more content.\n"], contents)