Make tests a package

Author: WizzyGeek

disctools/__version_info__.py

@@ -6,8 +6,8 @@
 }
 
 class last_modified:
-    day = 19
-    month = 1
+    day = 17
+    month = 2
     year = 2021
 
     @classmethod
@@ -61,7 +61,7 @@ def __repr__(self) -> str:
 version_info = VersionInfo(
     major = 0,
     minor = 3,
-    patch = 1,
+    patch = 2,
     status = status_map["final"],
 )
 

disctools/commands.py

@@ -69,27 +69,16 @@ def __new__(cls, name, bases, attrs):
 
 class CmdInitType(type):
     """Initializes a Command during definition"""
-    def __new__(cls, NamE, BaseS, AttrS, **kwargs) -> object: # type: ignore
+    def __new__(cls, name, bases, attrs, **kwargs) -> object: # type: ignore
         meta_args = ()
-        if '__init_args__' in AttrS:
-            meta_args = AttrS['__init_args__']
-            del AttrS['__init_args__']
-        clas = super().__new__(cls, NamE, BaseS, AttrS)
-        inst = clas(*meta_args, **kwargs)
-        return inst
+        if '__init_args__' in attrs:
+            meta_args = attrs['__init_args__']
+            del attrs['__init_args__']
+        return super().__new__(cls, name, bases, attrs)(*meta_args, **kwargs)
 
-# Metaclass of a metaclass or a function changing
-# the super class is extremely complicated hence this.
-class CogCmdInitType(CogCommandType):
+class CogCmdInitType(CmdInitType, CogCommandType):
     """Initializes a Cog like Cmd during definition"""
-    def __new__(cls, NamE, BaseS, AttrS, **kwargs) -> object: # type: ignore
-        meta_args = ()
-        if '__init_args__' in AttrS:
-            meta_args = AttrS['__init_args__']
-            del AttrS['__init_args__']
-        clas = super().__new__(cls, NamE, BaseS, AttrS)
-        inst = clas(*meta_args, **kwargs)
-        return inst
+    pass
 
 
 ## Commands ##

tests/__init__.py

@@ -0,0 +1,23 @@
+from os.path import abspath, dirname
+from sys import argv
+from sys import path as spath
+from test.support import load_package_tests
+
+try:
+    import disctools
+except ModuleNotFoundError:
+    local = True
+else:
+    local = False
+    del disctools
+
+def load_tests(loader, *args):
+    if ("--local" in argv) or local:
+        spath.insert(0, abspath("."))
+        print("Testing local disctools package")
+
+    return loader.loadTestsFromNames(
+            ["tests.test_bot",
+            "tests.test_cmd",
+            "tests.test_context"]
+        )

tests/__main__.py

@@ -1,11 +1,13 @@
-import unittest
+"""Disctool tests
 
-def test_suite():
-    return unittest.TestLoader().loadTestsFromNames(["test_bot", "test_cmd", "test_context"])
+CLI
+---
+`--local`, `-l`
+    Test the local disctools package instead of the installed package
+"""
+from unittest import main
+
+from . import load_tests
 
 if __name__ == "__main__":
-    # Running this file as main tests local code not the installed code
-    import sys
-    import os
-    sys.path.insert(0, os.path.abspath("."))
-    unittest.main(defaultTest='test_suite')
+    main()

tests/test_bot.py

@@ -3,7 +3,7 @@
 from disctools import AutoShardedBot as _AS
 from disctools import Bot, Command
 
-from utils import dummy
+from .utils import dummy
 
 
 class BotTest(unittest.TestCase):

tests/test_cmd.py

@@ -2,7 +2,7 @@
 
 from disctools import CCmd, Command, ICCmd, ICommand, inject, inject_cmd
 
-from utils import dummy as _dummy
+from .utils import dummy as _dummy
 
 
 class CMDTest(unittest.TestCase):

tests/utils.py

@@ -1,2 +1,3 @@
+"""Utils for tests"""
 
 async def dummy(*args, **kwargs): pass

version.num

@@ -1 +1 @@
-0.3.1
+0.3.2