From cb3694d41461b3a707d12bec28357c20a7f1b5a7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?David=20Barrag=C3=A1n=20Merino?= Date: Thu, 3 Oct 2013 17:46:09 +0200 Subject: [PATCH] Fixed the settings for tests --- greenmine/settings/common.py | 17 ++++++++++++----- greenmine/settings/testing.py | 7 ++----- 2 files changed, 14 insertions(+), 10 deletions(-) diff --git a/greenmine/settings/common.py b/greenmine/settings/common.py index 44a911d5..55b50071 100644 --- a/greenmine/settings/common.py +++ b/greenmine/settings/common.py @@ -28,11 +28,7 @@ LANGUAGES = ( ('ru', _('Russian')), ) -if 'test' in sys.argv: - if "settings" not in ",".join(sys.argv): - print ("Not settings specified. \nTry: python manage.py test " - "--settings=greenmine.settings.testing -v2 scrum") - sys.exit(0) + MANAGERS = ADMINS @@ -302,3 +298,14 @@ REST_FRAMEWORK = { } from .appdefaults import * + + +# NOTE: DON'T INSERT MORE SETTINGS AFTER THIS LINE + +# Test conditions +if 'test' in sys.argv: + if "settings" not in ",".join(sys.argv): + print "\033[1;91mNot settings specified.\033[0m" + print ("Try: \033[1;33mpython manage.py test --settings=" + "greenmine.settings.testing -v2\033[0m") + sys.exit(0) diff --git a/greenmine/settings/testing.py b/greenmine/settings/testing.py index 7329b7b8..c4d5225f 100644 --- a/greenmine/settings/testing.py +++ b/greenmine/settings/testing.py @@ -1,8 +1,5 @@ # -*- coding: utf-8 -*- - from .development import * -GREENQUEUE_BACKEND = 'greenqueue.backends.sync.SyncService' -GREENQUEUE_WORKER_MANAGER = 'greenqueue.worker.sync.SyncManager' - -INSTALLED_APPS.append('greenmine.taggit.tests') +SKIP_SOUTH_TESTS = True +SOUTH_TESTS_MIGRATE = False