tests: Fix issues with test ordering dependencies

plugins/badwords.py

@@ -102,7 +102,7 @@ def list_bad(text):
 
 
 @hook.event([EventType.message, EventType.action], singlethread=True)
-def test_badwords(conn, message, chan, content, nick):
+def check_badwords(conn, message, chan, content, nick):
     match = matcher.regex.match(content)
     if not match:
         return

plugins/twitch.py

@@ -8,7 +8,7 @@
 multitwitch_re = re.compile(r'(.*:)//(www.multitwitch.tv|multitwitch.tv)/(.*)', re.I)
 
 
-def test_name(s):
+def check_name(s):
     valid = set('ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789_/')
     return set(s) <= valid
 
@@ -65,7 +65,7 @@ def multitwitch_url(match, reply):
     usernames = match.group(3).split("/")
     out = ""
     for i in usernames:
-        if not test_name(i):
+        if not check_name(i):
             return None
         if out == "":
             out = twitch_lookup(i, reply)
@@ -78,7 +78,7 @@ def multitwitch_url(match, reply):
 def twitch_url(match, reply):
     bit = match.group(4).split("#")[0]
     location = "/".join(bit.split("/")[1:])
-    if not test_name(location):
+    if not check_name(location):
         return None
     return twitch_lookup(location, reply)
 
@@ -87,7 +87,7 @@ def twitch_url(match, reply):
 def twitch(text, reply):
     """<channel name> - Retrieves the channel and shows it's offline/offline status"""
     text = text.split("/")[-1]
-    if test_name(text):
+    if check_name(text):
         location = text
     else:
         return "Not a valid channel name."

tests/plugin_tests/test_duckhunt.py

@@ -5,8 +5,6 @@
 from sqlalchemy import create_engine
 from sqlalchemy.orm import scoped_session, sessionmaker
 
-from plugins.duckhunt import top_list
-
 
 class MockDB:
     def __init__(self):
@@ -31,17 +29,19 @@ def mock_db():
     ],
 ])
 def test_top_list(prefix, items, result):
+    from plugins.duckhunt import top_list
     assert top_list(prefix, items.items()) == result
 
 
 def test_display_scores(mock_db):
-    from cloudbot.util.database import metadata
-    metadata.bind = mock_db.engine
+    from cloudbot.util import database
+    importlib.reload(database)
+    database.metadata.bind = mock_db.engine
     from plugins import duckhunt
 
     importlib.reload(duckhunt)
 
-    metadata.create_all(checkfirst=True)
+    database.metadata.create_all(checkfirst=True)
 
     session = mock_db.session()
 

tests/plugin_tests/test_factoids.py

@@ -1,3 +1,4 @@
+import importlib
 from textwrap import dedent
 
 import pytest
@@ -49,6 +50,10 @@ def test_remove_fact_no_paste():
 
 
 def test_remove_fact(patch_paste):
+    from cloudbot.util import database
+    importlib.reload(database)
+    from plugins import factoids
+    importlib.reload(factoids)
     from plugins.factoids import factoid_cache
     factoid_cache.clear()
     mock_session = MagicMock()
@@ -82,6 +87,10 @@ def test_remove_fact(patch_paste):
 
 
 def test_clear_facts():
+    from cloudbot.util import database
+    importlib.reload(database)
+    from plugins import factoids
+    importlib.reload(factoids)
     mock_session = MagicMock()
 
     from plugins.factoids import forget_all

tests/plugin_tests/test_utility.py

@@ -293,7 +293,7 @@ def test_munge(text, leet_data):
 @pytest.mark.parametrize('text', [
     'foo bar baz!',
 ])
-def test_leet(text):
+def test_leet(text, leet_data):
     from plugins.utility import leet
     assert leet(text)
 

tests/plugin_tests/test_weather.py

@@ -22,7 +22,7 @@ def __init__(self, config):
         self.config = MockConfig(self, config)
 
 
-@pytest.mark.parametrize('bearing,direction', {
+@pytest.mark.parametrize('bearing,direction', [
     (360, 'N'),
     (0, 'N'),
     (1, 'N'),
@@ -40,7 +40,7 @@ def __init__(self, config):
     (180, 'S'),
     (348.75, 'N'),
     (348.74, 'NNW'),
-})
+])
 def test_wind_direction(bearing, direction):
     from plugins.weather import bearing_to_card
     assert bearing_to_card(bearing) == direction