Fix travis and pathing

.travis.yml

@@ -10,4 +10,4 @@ python:
   - '3.6'
   - 'nightly'
 
-script: 'python setup.py test'
+script: 'py.test'

setup.cfg

@@ -0,0 +1,5 @@
+[aliases]
+test=pytest
+
+[tool:pytest]
+python_files = tests/*.py

setup.py

@@ -32,6 +32,7 @@ setup(
     install_requires=requirements,
     extras_require=extras_require,
     test_suite='tests',
+    setup_requires=['pytest-runner'],
     tests_require=['pytest', 'pytest-benchmark'],
     classifiers=[
         'Development Status :: 4 - Beta',

tests/api/reason.py

@@ -1,18 +1,18 @@
 from unittest import TestCase
 
+from tests.utils import APIClient
+
 
 class TestReason(TestCase):
     def test_set_unicode_reason(self):
-        from tests.utils import TestAPIClient
-        api = TestAPIClient()
+        api = APIClient()
         api.guilds_channels_modify(1, 2, 3, reason=u'yo \U0001F4BF test')
 
         _, kwargs = api.http.calls[0]
         self.assertEqual(kwargs['headers']['X-Audit-Log-Reason'], 'yo%20%F0%9F%92%BF%20test')
 
     def test_null_reason(self):
-        from tests.utils import TestAPIClient
-        api = TestAPIClient()
+        api = APIClient()
         api.guilds_channels_modify(1, 2, 3, reason=None)
 
         _, kwargs = api.http.calls[0]

tests/utils.py

@@ -1,4 +1,4 @@
-from disco.api.client import APIClient
+from disco.api.client import APIClient as _APIClient
 
 
 class CallContainer(object):
@@ -9,7 +9,7 @@ class CallContainer(object):
         self.calls.append((args, kwargs))
 
 
-class TestAPIClient(APIClient):
+class APIClient(_APIClient):
     def __init__(self):
         self.client = None
         self.http = CallContainer()