Merge pull request #15 from smartfile/fix-testing

Fix CI testing

Author: btimby

Makefile

@@ -1,23 +1,30 @@
+.PHONY: test
 test:
 	coverage run tests.py
 
+.PHONY: verify
 verify:
 	pyflakes smartfile
 	pep8 --ignore=E501,E225 smartfile
 
+.PHONY: install
 install:
 	python setup.py install
 
+.PHONY: publish
 publish:
 	python setup.py register
 	python setup.py sdist upload
 
+.PHONY: profile
 profile:
 	python profile.py
 
+.PHONY: clean
 clean:
 	find . -name *.pyc -delete
 
+.PHONY: distclean
 distclean: clean
 	rm -rf env
 

tests.py

@@ -303,8 +303,9 @@ def test_netrc(self):
                     address, port = address
                 else:
                     port = self.server.server_port
-                netrc = b"machine 127.0.0.1:%s\n  login %s\n  password %s" % (
+                netrc = 'machine 127.0.0.1:%i\n  login %s\n  password %s' % (
                         port, API_KEY, API_PASSWORD)
+                netrc = netrc.encode('utf8')
                 os.write(fd, netrc)
             finally:
                 os.close(fd)
@@ -359,7 +360,7 @@ def respond(self, request):
         self.send_response(200)
         self.send_header("Content-Type", "application/json")
         self.end_headers()
-        self.wfile.write(b"%s" % (json.dumps({'foo': 'bar'}), ))
+        self.wfile.write(json.dumps({'foo': 'bar'}).encode('utf8'))
 
 
 class JSONTestCase(object):