Annikka/evennia
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fixed unittest-runner's lookup of new directory structure

Browse source
This commit is contained in:
Griatch 2015-01-18 14:31:01 +01:00
parent 48ddd71a96
commit 07087af395
1 changed files with 3 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

5
evennia/server/tests.py
View file

@ -16,6 +16,7 @@ Guidelines:
methods assert*() are used to test the behaviour. methods assert*() are used to test the behaviour.
""" """
import os
import sys import sys
import glob import glob
@ -45,7 +46,7 @@ class EvenniaTestSuiteRunner(DjangoTestSuiteRunner):
""" """
if not test_labels: if not test_labels:
test_labels = [applabel.rsplit('.', 1)[1] for applabel in settings.INSTALLED_APPS 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) 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(locktests))
tsuite.addTest(unittest.defaultTestLoader.loadTestsFromModule(utiltests)) 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) testmod = mod_import(path)
tsuite.addTest(unittest.defaultTestLoader.loadTestsFromModule(testmod)) tsuite.addTest(unittest.defaultTestLoader.loadTestsFromModule(testmod))