diff --git a/oauth2client/tools.py b/oauth2client/tools.py index 235793b9d..20faa4375 100644 --- a/oauth2client/tools.py +++ b/oauth2client/tools.py @@ -99,9 +99,9 @@ def do_GET(self): query = self.path.split('?', 1)[-1] query = dict(urllib.parse.parse_qsl(query)) self.server.query_params = query - self.wfile.write("Authentication Status") - self.wfile.write("

The authentication flow has completed.

") - self.wfile.write("") + self.wfile.write(b"Authentication Status") + self.wfile.write(b"

The authentication flow has completed.

") + self.wfile.write(b"") def log_message(self, format, *args): """Do not log messages to stdout while running as command line program.""" diff --git a/tests/test_tools.py b/tests/test_tools.py new file mode 100644 index 000000000..23aca9025 --- /dev/null +++ b/tests/test_tools.py @@ -0,0 +1,30 @@ +"""Unit tests for oauth2client.tools.""" + +import unittest +from oauth2client import tools +from six.moves.urllib import request +import threading + +class TestClientRedirectServer(unittest.TestCase): + """Test the ClientRedirectServer and ClientRedirectHandler classes.""" + + def test_ClientRedirectServer(self): + # create a ClientRedirectServer and run it in a thread to listen + # for a mock GET request with the access token + # the server should return a 200 message and store the token + httpd = tools.ClientRedirectServer(('localhost', 0), tools.ClientRedirectHandler) + code = 'foo' + url = 'http://localhost:%i?code=%s' % (httpd.server_address[1], code) + t = threading.Thread(target = httpd.handle_request) + t.setDaemon(True) + t.start() + f = request.urlopen( url ) + self.assertTrue(f.read()) + t.join() + httpd.server_close() + self.assertEqual(httpd.query_params.get('code'),code) + + +if __name__ == '__main__': + unittest.main() +