From af4d22e61404698548d2df84d84acdaa04b6fcc6 Mon Sep 17 00:00:00 2001
From: andrei <b1naryth1ef@gmail.com>
Date: Tue, 18 Jul 2017 14:36:16 -0700
Subject: [PATCH] Fix travis and pathing

---
 .travis.yml         | 2 +-
 setup.cfg           | 5 +++++
 setup.py            | 1 +
 tests/api/reason.py | 8 ++++----
 tests/utils.py      | 4 ++--
 5 files changed, 13 insertions(+), 7 deletions(-)
 create mode 100644 setup.cfg

diff --git a/.travis.yml b/.travis.yml
index 4e6a402..cd15ae9 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -10,4 +10,4 @@ python:
   - '3.6'
   - 'nightly'
 
-script: 'python setup.py test'
+script: 'py.test'
diff --git a/setup.cfg b/setup.cfg
new file mode 100644
index 0000000..8f214ee
--- /dev/null
+++ b/setup.cfg
@@ -0,0 +1,5 @@
+[aliases]
+test=pytest
+
+[tool:pytest]
+python_files = tests/*.py
diff --git a/setup.py b/setup.py
index bee0a7b..e348bae 100644
--- a/setup.py
+++ b/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',
diff --git a/tests/api/reason.py b/tests/api/reason.py
index 4582467..cd9c5fa 100644
--- a/tests/api/reason.py
+++ b/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]
diff --git a/tests/utils.py b/tests/utils.py
index 74f9766..36fde6f 100644
--- a/tests/utils.py
+++ b/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()