From 07087af395039accc3715d389a550f151e2fdd91 Mon Sep 17 00:00:00 2001 From: Griatch Date: Sun, 18 Jan 2015 14:31:01 +0100 Subject: [PATCH] Fixed unittest-runner's lookup of new directory structure --- evennia/server/tests.py | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/evennia/server/tests.py b/evennia/server/tests.py index 200b9e3e0a..032187ac81 100644 --- a/evennia/server/tests.py +++ b/evennia/server/tests.py @@ -16,6 +16,7 @@ Guidelines: methods assert*() are used to test the behaviour. """ +import os import sys import glob @@ -45,7 +46,7 @@ class EvenniaTestSuiteRunner(DjangoTestSuiteRunner): """ if not test_labels: test_labels = [applabel.rsplit('.', 1)[1] for applabel in settings.INSTALLED_APPS - if (applabel.startswith('evennia.') or applabel.startswith('game.'))] + if applabel.startswith('evennia.')] return super(EvenniaTestSuiteRunner, self).build_suite(test_labels, extra_tests=extra_tests, **kwargs) @@ -66,7 +67,7 @@ def suite(): tsuite.addTest(unittest.defaultTestLoader.loadTestsFromModule(locktests)) tsuite.addTest(unittest.defaultTestLoader.loadTestsFromModule(utiltests)) - for path in glob.glob("../evennia/tests/test_*.py"): + for path in glob.glob(os.path.join(settings.EVENNIA_DIR, "tests", "*.py")): testmod = mod_import(path) tsuite.addTest(unittest.defaultTestLoader.loadTestsFromModule(testmod))