From 3667171d72c008f4d1ed68948ef86cf5b07e372d Mon Sep 17 00:00:00 2001 From: Alen Mujezinovic Date: Thu, 17 Jan 2013 16:12:52 +0000 Subject: [PATCH] Added manage.py for testing purposes --- .travis.yml | 2 +- manage.py | 10 ++++++++++ test.sh | 5 +++++ tests/test.sh | 5 ----- tox.ini | 2 +- 5 files changed, 17 insertions(+), 7 deletions(-) create mode 100644 manage.py create mode 100755 test.sh delete mode 100755 tests/test.sh diff --git a/.travis.yml b/.travis.yml index 30c27fa..2068a93 100644 --- a/.travis.yml +++ b/.travis.yml @@ -15,5 +15,5 @@ branches: only: - master - develop -script: tests/test.sh +script: ./test.sh diff --git a/manage.py b/manage.py new file mode 100644 index 0000000..dc935d6 --- /dev/null +++ b/manage.py @@ -0,0 +1,10 @@ +#!/usr/bin/env python +import os +import sys + +if __name__ == "__main__": + os.environ.setdefault("DJANGO_SETTINGS_MODULE", "tests.settings") + + from django.core.management import execute_from_command_line + + execute_from_command_line(sys.argv) diff --git a/test.sh b/test.sh new file mode 100755 index 0000000..2a4d1a1 --- /dev/null +++ b/test.sh @@ -0,0 +1,5 @@ +#!/bin/bash + +python manage.py test provider oauth2 + + diff --git a/tests/test.sh b/tests/test.sh deleted file mode 100755 index 78ce4a0..0000000 --- a/tests/test.sh +++ /dev/null @@ -1,5 +0,0 @@ -#!/bin/bash - -PYTHONPATH=$PWD/../:$PYTHONPATH - -django-admin.py test provider oauth2 --settings tests.settings diff --git a/tox.ini b/tox.ini index 021ba2e..26d0871 100644 --- a/tox.ini +++ b/tox.ini @@ -7,7 +7,7 @@ setenv = PYTHONPATH = {toxinidir} commands = pip install -q -r requirements.txt --use-mirrors - {toxinidir}/tests/test.sh + {toxinidir}/test.sh deps = [testenv:py2.7-django1.5]