Cosmetic: Clean up tests

* rename test cases to conform to conventions for pytest discovery
* nix unittest stuff since we're not using it at all and it makes using
  fixtures more difficult

Author: willkg

tests/test_cmdline.py

@@ -1,5 +1,4 @@
 import os
-from unittest import TestCase
 
 from click.testing import CliRunner
 
@@ -12,7 +11,7 @@
 # http://click.pocoo.org/5/testing/#file-system-isolation
 
 
-class CmdlineHelpTestCase(TestCase):
+class TestCmdlineHelp:
     def test_help(self):
         """Basic test to make sure the cli works"""
         runner = CliRunner()
@@ -21,7 +20,7 @@ def test_help(self):
         assert 'Usage' in result.output.splitlines()[0]
 
 
-class CreateprojectTestCase(TestCase):
+class TestCreateproject:
     def test_help(self):
         runner = CliRunner()
         result = runner.invoke(cli, ('createproject', '--help'))
@@ -50,7 +49,7 @@ def test_directory_already_exists(self):
             assert '{0} exists.'.format(os.path.join(path, 'testprj')) in result.output
 
 
-class FetchTestCase(TestCase):
+class TestFetch:
     def test_help(self):
         runner = CliRunner()
         result = runner.invoke(cli, ('fetch', '--help'))
@@ -59,7 +58,7 @@ def test_help(self):
     # FIXME: More extensive tests
 
 
-class PullTestCase(TestCase):
+class TestPull:
     def test_help(self):
         runner = CliRunner()
         result = runner.invoke(cli, ('pull', '--help'))
@@ -68,7 +67,7 @@ def test_help(self):
     # FIXME: More extensive tests
 
 
-class PushTestCase(TestCase):
+class TestPush:
     def test_help(self):
         runner = CliRunner()
         result = runner.invoke(cli, ('push', '--help'))
@@ -77,7 +76,7 @@ def test_help(self):
     # FIXME: More extensive tests
 
 
-class ScrapevideoTestCase(TestCase):
+class TestScrapevideo:
     def test_help(self):
         runner = CliRunner()
         result = runner.invoke(cli, ('scrapevideo', '--help'))
@@ -86,7 +85,7 @@ def test_help(self):
     # FIXME: More extensive tests
 
 
-class StatusTestCase(TestCase):
+class TestStatus:
     def test_help(self):
         runner = CliRunner()
         result = runner.invoke(cli, ('status', '--help'))
@@ -95,7 +94,7 @@ def test_help(self):
     # FIXME: More extensive tests
 
 
-class VerifyTestCase(TestCase):
+class TestVerify:
     def test_help(self):
         runner = CliRunner()
         result = runner.invoke(cli, ('verify', '--help'))
@@ -104,7 +103,7 @@ def test_help(self):
     # FIXME: More extensive tests
 
 
-class WebeditTestCase(TestCase):
+class TestWebedit:
     def test_help(self):
         runner = CliRunner()
         result = runner.invoke(cli, ('webedit', '--help'))

tests/test_restapi.py

@@ -6,25 +6,16 @@
 # license.
 #######################################################################
 
-from unittest import TestCase
-
 from steve.restapi import urljoin
 
 
-class UrlJoinTestCase(TestCase):
-    def test_urljoin(self):
-        for base, args, expected in [
-            ('http://localhost', ['path1'],
-             'http://localhost/path1'),
-
-            ('http://localhost/path1', ['path2'],
-             'http://localhost/path1/path2'),
-
-            ('http://localhost', ['path1', 'path2'],
-             'http://localhost/path1/path2'),
-
-            ('http://localhost?foo=bar', ['path1'],
-             'http://localhost/path1?foo=bar'),
-        ]:
+def test_urljoin():
+    data = [
+        ('http://localhost', ['path1'], 'http://localhost/path1'),
+        ('http://localhost/path1', ['path2'], 'http://localhost/path1/path2'),
+        ('http://localhost', ['path1', 'path2'], 'http://localhost/path1/path2'),
+        ('http://localhost?foo=bar', ['path1'], 'http://localhost/path1?foo=bar'),
+    ]
 
-            assert urljoin(base, *args) == expected
+    for base, args, expected in data:
+        assert urljoin(base, *args) == expected

tests/test_utils.py

@@ -6,7 +6,7 @@
 # license.
 #######################################################################
 
-from unittest import TestCase
+import pytest
 
 from steve.util import (
     get_video_id,
@@ -17,7 +17,7 @@
 )
 
 
-class VerifyVideoDataTestCase(TestCase):
+class TestVerifyVideoData:
     default = {
         'title': 'Foo',
         'category': 'Test Category',
@@ -160,8 +160,5 @@ def test_get_video_id():
         'http://pyvideo.org/video/foo'
     ]
     for url in data:
-        try:
+        with pytest.raises(SteveException):
             get_video_id(url)
-            assert False
-        except SteveException:
-            pass