Plugging retry tests

Author: westover

tests/integration/test_client_server.py

@@ -97,8 +97,8 @@ def test_tcurl(mock_server):
         '--raw',
     ])
 
-    assert response.headers == endpoint
-    assert response.body == "hello"
+    assert response.headers == endpoint.encode('utf8')
+    assert response.body == "hello".encode('utf8')
 
 
 @pytest.mark.gen_test

tests/integration/test_retry.py

@@ -131,8 +131,8 @@ def after_receive_error(self, request, error):
 
 
 @pytest.mark.gen_test
-@mock.patch('tchannel.tornado.Request.should_retry_on_error')
-def test_retry_on_error_success(mock_should_retry_on_error):
+def test_retry_on_error_success():
+    mock_should_retry_on_error = mock.patch('tchannel.tornado.Request.should_retry_on_error')
     mock_should_retry_on_error.return_value = True
 
     endpoint = 'tchannelretrytest'
@@ -158,8 +158,8 @@ def test_retry_on_error_success(mock_should_retry_on_error):
 
     header = yield response.get_header()
     body = yield response.get_body()
-    assert body == "success"
-    assert header == ""
+    assert body == b"success"
+    assert header == b""
 
     assert hook.received_response == 1
     assert hook.received_error == 2