From fa4b1eca846824dd50554280d99713a60c64ec3f Mon Sep 17 00:00:00 2001
From: spl0k <alban.feron@gmail.com>
Date: Sat, 28 Oct 2017 11:16:44 +0200
Subject: [PATCH] A bit of sorting

---
 tests/__init__.py                           | 10 ++++-----
 tests/base/__init__.py                      | 21 ++++++++++++++++++
 tests/{ => base}/test_db.py                 |  0
 tests/managers/__init__.py                  | 24 +++++++++++++++++++++
 tests/{ => managers}/test_manager_folder.py |  0
 tests/{ => managers}/test_manager_user.py   |  0
 6 files changed, 49 insertions(+), 6 deletions(-)
 create mode 100644 tests/base/__init__.py
 rename tests/{ => base}/test_db.py (100%)
 create mode 100644 tests/managers/__init__.py
 rename tests/{ => managers}/test_manager_folder.py (100%)
 rename tests/{ => managers}/test_manager_user.py (100%)

diff --git a/tests/__init__.py b/tests/__init__.py
index 9867da1..e305a74 100644
--- a/tests/__init__.py
+++ b/tests/__init__.py
@@ -11,20 +11,18 @@
 
 import unittest
 
-from .test_db import DbTestCase
+import base
+import managers
 
-from .test_manager_folder import FolderManagerTestCase
-from .test_manager_user import UserManagerTestCase
 from .test_api import ApiTestCase
 from .test_frontend import FrontendTestCase
 
 def suite():
     suite = unittest.TestSuite()
 
-    suite.addTest(unittest.makeSuite(DbTestCase))
+    suite.addTest(base.suite())
 
-    suite.addTest(unittest.makeSuite(FolderManagerTestCase))
-    suite.addTest(unittest.makeSuite(UserManagerTestCase))
+    suite.addTest(managers.suite())
     suite.addTest(unittest.makeSuite(ApiTestCase))
     suite.addTest(unittest.makeSuite(FrontendTestCase))
 
diff --git a/tests/base/__init__.py b/tests/base/__init__.py
new file mode 100644
index 0000000..0012e0c
--- /dev/null
+++ b/tests/base/__init__.py
@@ -0,0 +1,21 @@
+# -*- coding: utf-8 -*-
+# vim:fenc=utf-8
+#
+# This file is part of Supysonic.
+# Supysonic is a Python implementation of the Subsonic server API.
+#
+# Copyright (C) 2017 Alban 'spl0k' Féron
+#
+# Distributed under terms of the GNU AGPLv3 license.
+
+import unittest
+
+from .test_db import DbTestCase
+
+def suite():
+    suite = unittest.TestSuite()
+
+    suite.addTest(unittest.makeSuite(DbTestCase))
+
+    return suite
+
diff --git a/tests/test_db.py b/tests/base/test_db.py
similarity index 100%
rename from tests/test_db.py
rename to tests/base/test_db.py
diff --git a/tests/managers/__init__.py b/tests/managers/__init__.py
new file mode 100644
index 0000000..e7c4bfd
--- /dev/null
+++ b/tests/managers/__init__.py
@@ -0,0 +1,24 @@
+# -*- coding: utf-8 -*-
+# vim:fenc=utf-8
+#
+# This file is part of Supysonic.
+# Supysonic is a Python implementation of the Subsonic server API.
+#
+# Copyright (C) 2017 Alban 'spl0k' Féron
+#               2017 Óscar García Amor
+#
+# Distributed under terms of the GNU AGPLv3 license.
+
+import unittest
+
+from .test_manager_folder import FolderManagerTestCase
+from .test_manager_user import UserManagerTestCase
+
+def suite():
+    suite = unittest.TestSuite()
+
+    suite.addTest(unittest.makeSuite(FolderManagerTestCase))
+    suite.addTest(unittest.makeSuite(UserManagerTestCase))
+
+    return suite
+
diff --git a/tests/test_manager_folder.py b/tests/managers/test_manager_folder.py
similarity index 100%
rename from tests/test_manager_folder.py
rename to tests/managers/test_manager_folder.py
diff --git a/tests/test_manager_user.py b/tests/managers/test_manager_user.py
similarity index 100%
rename from tests/test_manager_user.py
rename to tests/managers/test_manager_user.py