svn commit: r1897708 - in /subversion/trunk/subversion/tests/cmdline: externals_tests.py stat_tests.py

[ju...@apache.org]

Author: jun66j5
Date: Thu Feb  3 03:55:24 2022
New Revision: 1897708

URL: http://svn.apache.org/viewvc?rev=1897708&view=rev
Log:
tests: Fix TypeError raised from XFAIL test cases with Python 3.

* subversion/tests/cmdline/externals_tests.py
  (file_external_versioned_obstruction):
  Pass a bytes instance for `expected_stdout` because svnmucc output is binary.

* subversion/tests/cmdline/stat_tests.py
  (modified_modulo_translation):
  Pass a bytes instance for file writing with binary mode.

Modified:
    subversion/trunk/subversion/tests/cmdline/externals_tests.py
    subversion/trunk/subversion/tests/cmdline/stat_tests.py

Modified: subversion/trunk/subversion/tests/cmdline/externals_tests.py
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/tests/cmdline/externals_tests.py?rev=1897708&r1=1897707&r2=1897708&view=diff
==============================================================================
--- subversion/trunk/subversion/tests/cmdline/externals_tests.py (original)
+++ subversion/trunk/subversion/tests/cmdline/externals_tests.py Thu Feb  3 03:55:24 2022
@@ -3292,7 +3292,7 @@ def file_external_versioned_obstruction(
   sbox.build()
   wc_dir = sbox.wc_dir
 
-  expected_output = verify.RegexOutput('r2 committed .*')
+  expected_output = verify.RegexOutput(b'r2 committed .*')
   svntest.actions.run_and_verify_svnmucc(expected_output, [],
                            '-U', sbox.repo_url, '-m', 'r2: set external',
                            'propset', 'svn:externals', '^/A/mu mu-ext', 'A')
@@ -3317,7 +3317,7 @@ def file_external_versioned_obstruction(
   # external obstruction then when the external is deleted the
   # versioned node is missing from disk and wc.db.  Not really sure
   # what should happen, perhaps a not-present node?
-  expected_output = verify.RegexOutput('r3 committed .*')
+  expected_output = verify.RegexOutput(b'r3 committed .*')
   svntest.actions.run_and_verify_svnmucc(expected_output, [],
                            '-U', sbox.repo_url, '-m', 'r3: copy file',
                            'cp', 'head', 'A/mu', 'A/mu-ext',

Modified: subversion/trunk/subversion/tests/cmdline/stat_tests.py
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/tests/cmdline/stat_tests.py?rev=1897708&r1=1897707&r2=1897708&view=diff
==============================================================================
--- subversion/trunk/subversion/tests/cmdline/stat_tests.py (original)
+++ subversion/trunk/subversion/tests/cmdline/stat_tests.py Thu Feb  3 03:55:24 2022
@@ -1950,7 +1950,7 @@ def modified_modulo_translation(sbox):
 
   # CRLF it.
   with open(sbox.ospath('iota'), 'wb') as f:
-    f.write("This is the file 'iota'.\r\n")
+    f.write(b"This is the file 'iota'.\r\n")
 
   # Run status.  Expect some output.
   # TODO: decide how such files should show in the output; whether they