From d833536f488512518fa71daf8eeffd614f32aee5 Mon Sep 17 00:00:00 2001 From: Ales Zoulek Date: Thu, 2 Dec 2010 11:08:01 +0100 Subject: [PATCH] Fixed: test runner --- setup.py | 2 +- tests/__init__.py | 0 tests/runtests.py | 11 +++++++---- 3 files changed, 8 insertions(+), 5 deletions(-) create mode 100644 tests/__init__.py mode change 100644 => 100755 tests/runtests.py diff --git a/setup.py b/setup.py index 90cc4ea..5147385 100644 --- a/setup.py +++ b/setup.py @@ -33,6 +33,6 @@ setup( ], packages=find_packages(exclude=['tests']), include_package_data=True, - test_suite='tests.runtests.runtests', + test_suite='tests.runtests.main', ) diff --git a/tests/__init__.py b/tests/__init__.py new file mode 100644 index 0000000..e69de29 diff --git a/tests/runtests.py b/tests/runtests.py old mode 100644 new mode 100755 index 863ad47..bbe48f3 --- a/tests/runtests.py +++ b/tests/runtests.py @@ -1,20 +1,23 @@ +#!/usr/bin/env python """Borrowed from Carl Meyer's django-adminfiles.""" import os import sys -parent = os.path.dirname(os.path.dirname(os.path.abspath(__file__))) -sys.path.insert(0, parent) +currentdir = os.path.dirname(os.path.abspath(__file__)) +parentdir = os.path.dirname(currentdir) +sys.path.insert(0, parentdir) +sys.path.insert(0, currentdir) os.environ['DJANGO_SETTINGS_MODULE'] = 'testproject.settings' from django.test.simple import run_tests -def runtests(): +def main(): failures = run_tests(['test_app'], verbosity=1, interactive=True) sys.exit(failures) if __name__ == '__main__': - runtests() + main()