svn commit: r1743593 - /subversion/trunk/subversion/tests/cmdline/mod_authz_svn_tests.py

[st...@apache.org]

Author: stefan2
Date: Fri May 13 02:27:44 2016
New Revision: 1743593

URL: http://svn.apache.org/viewvc?rev=1743593&view=rev
Log:
Make the mod_authz_svn tests pass with Python 3 and ra-dav.

* subversion/tests/cmdline/mod_authz_svn_tests.py
  (verify_get): Fix the httplib import for py3.  Conversion into base64
                has bytes strings as input and output.  Interpret server
                responses as ascii strings, unless binary data was expected,
                which currently is never the case.

Modified:
    subversion/trunk/subversion/tests/cmdline/mod_authz_svn_tests.py

Modified: subversion/trunk/subversion/tests/cmdline/mod_authz_svn_tests.py
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/tests/cmdline/mod_authz_svn_tests.py?rev=1743593&r1=1743592&r2=1743593&view=diff
==============================================================================
--- subversion/trunk/subversion/tests/cmdline/mod_authz_svn_tests.py (original)
+++ subversion/trunk/subversion/tests/cmdline/mod_authz_svn_tests.py Fri May 13 02:27:44 2016
@@ -107,7 +107,7 @@ def verify_get(test_area_url, path, user
     from urlparse import urlparse
   except ImportError:
     # Python >=3.0
-    import http.client
+    import http.client as httplib
     from urllib.parse import urlparse
 
   import base64
@@ -126,7 +126,8 @@ def verify_get(test_area_url, path, user
 
   if user and pw:
       auth_info = user + ':' + pw
-      headers['Authorization'] = 'Basic ' + base64.b64encode(auth_info)
+      user_pw = base64.b64encode(auth_info.encode()).decode()
+      headers['Authorization'] = 'Basic ' + user_pw
   else:
       auth_info = "anonymous"
 
@@ -145,6 +146,8 @@ def verify_get(test_area_url, path, user
 
   if expected_body:
       actual_body = r.read()
+      if isinstance(expected_body, str) and not isinstance(actual_body, str):
+        actual_body = actual_body.decode()
       if expected_body != actual_body:
         logger.warn("Expected body:")
         logger.warn(expected_body)