Refactor tests, move to pytest, etc

.gitignore

@@ -5,6 +5,7 @@ storage.db
 storage.json
 *.dca
 .eggs/
+.cache/
 
 # Documentation stuff
 docs/api/

setup.py

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

tests/gateway/events.py

@@ -0,0 +1,20 @@
+from disco.gateway.events import GatewayEvent, Resumed
+
+
+def create_resumed_payload():
+    return GatewayEvent.from_dispatch(None, {
+        't': 'RESUMED',
+        'd': {
+            '_trace': ['test', '1', '2', '3'],
+        }
+    })
+
+
+def test_from_dispatch():
+    event = create_resumed_payload()
+    assert isinstance(event, Resumed)
+    assert event.trace == ['test', '1', '2', '3']
+
+
+def test_event_creation(benchmark):
+    benchmark(create_resumed_payload)

tests/test_channel.py → tests/types/channel.py

@@ -4,7 +4,7 @@ from disco.types.channel import Channel, ChannelType
 
 
 class TestChannel(TestCase):
-    def test_nsfw_channel(self):
+    def test_deprecated_nsfw_channel(self):
         channel = Channel(
             name='nsfw-testing',
             type=ChannelType.GUILD_TEXT)
@@ -19,3 +19,7 @@ class TestChannel(TestCase):
             name='nsfw_testing',
             type=ChannelType.GUILD_TEXT)
         self.assertFalse(channel.is_nsfw)
+
+    def test_nsfw_channel(self):
+        channel = Channel(name='test', nsfw=True, type=ChannelType.GUILD_TEXT)
+        assert channel.is_nsfw

tests/utils.py

@@ -1,5 +1,3 @@
-import time
-import contextlib
 from disco.api.client import APIClient
 
 
@@ -15,24 +13,3 @@ class TestAPIClient(APIClient):
     def __init__(self):
         self.client = None
         self.http = CallContainer()
-
-
-def bench(times, func):
-    main_start = time.time()
-
-    worst = None
-    best = None
-
-    for _ in range(times):
-        start = time.time()
-        func()
-        dur = time.time() - start
-
-        if not worst or dur > worst:
-            worst = dur
-
-        if not best or dur < best:
-            best = dur
-
-    main_dur = time.time() - main_start
-    return main_dur, worst, best