From b473440cc1038ae9e745141ea4084291c7f8ea6d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Braulio=20Valdivielso=20Mart=C3=ADnez?=
 <brlvldvlsmrtnz@gmail.com>
Date: Mon, 7 Mar 2016 18:33:06 +0100
Subject: [PATCH] Fix tests in python 3

---
 tests/test_lowlevel.py     |  2 +-
 tests/test_testserver.py   | 18 +++++++++---------
 tests/testserver/server.py |  2 +-
 3 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/tests/test_lowlevel.py b/tests/test_lowlevel.py
index 4e5d7826..eb6d6273 100644
--- a/tests/test_lowlevel.py
+++ b/tests/test_lowlevel.py
@@ -1,7 +1,7 @@
 import threading
 import requests
 
-from testserver.server import Server
+from tests.testserver.server import Server
 
 
 def test_chunked_upload():
diff --git a/tests/test_testserver.py b/tests/test_testserver.py
index 38d685b4..027f8e50 100644
--- a/tests/test_testserver.py
+++ b/tests/test_testserver.py
@@ -4,7 +4,7 @@ import time
 
 import pytest
 import requests
-from testserver.server import Server
+from tests.testserver.server import Server
 
 class TestTestServer:
     def test_basic(self):
@@ -90,19 +90,19 @@ class TestTestServer:
     def test_request_recovery(self):
         """can check the requests content"""
         server = Server.basic_response_server(requests_to_handle=2)
-        first_request = "put your hands up in the air"
-        second_request = "put your hand down in the floor"
+        first_request = b'put your hands up in the air'
+        second_request = b'put your hand down in the floor'
 
         with server as address:
             sock1 = socket.socket()
             sock2 = socket.socket()
             
             sock1.connect(address)
-            sock1.sendall(first_request.encode())
+            sock1.sendall(first_request)
             sock1.close()
 
             sock2.connect(address)
-            sock2.sendall(second_request.encode())
+            sock2.sendall(second_request)
             sock2.close()
 
         assert server.handler_results[0] == first_request
@@ -116,22 +116,22 @@ class TestTestServer:
             sock = socket.socket()
             sock.connect(address)
             time.sleep(1.5)
-            sock.sendall(b"hehehe, not received")
+            sock.sendall(b'hehehe, not received')
             sock.close()
 
-        assert server.handler_results[0] == ''
+        assert server.handler_results[0] == b''
 
 
     def test_request_recovery_with_bigger_timeout(self):
         """a biggest timeout can be specified"""
         server = Server.basic_response_server(request_timeout=3)
-        data = "bananadine"
+        data = b'bananadine'
 
         with server as address:
             sock = socket.socket() 
             sock.connect(address)
             time.sleep(1.5)
-            sock.sendall(data.encode())
+            sock.sendall(data)
             sock.close()
             
         assert server.handler_results[0] == data
diff --git a/tests/testserver/server.py b/tests/testserver/server.py
index c5f35d2b..bcffd14c 100644
--- a/tests/testserver/server.py
+++ b/tests/testserver/server.py
@@ -5,7 +5,7 @@ import select
 
 def consume_socket_content(sock, timeout=0.5):
     chunks = 65536
-    content = ""
+    content = b''
     more_to_read = select.select([sock], [], [], timeout)[0]
 
     while more_to_read: