Tivix/django-rest-auth
1
1
Fork 0
mirror of https://github.com/Tivix/django-rest-auth.git synced 2025-02-16 18:00:35 +03:00
Code Issues Packages Projects Releases Wiki Activity

remove unnecessary settings from tests

Browse Source
This commit is contained in:
Mateusz Sikora 2014-05-06 13:08:15 +02:00
parent 6993e98282
commit 1d9379c43b
2 changed files with 2 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
.travis.yml
View File

@ -3,8 +3,8 @@ python:
- "2.6" - "2.6"
- "2.7" - "2.7"
env: env:
- DJANGO=1.5.7 DJANGO_SETTINGS_MODULE="rest_auth.test_settings" - DJANGO=1.5.7
- DJANGO=1.6.4 DJANGO_SETTINGS_MODULE="rest_auth.test_settings" - DJANGO=1.6.4
install: install:
- pip install -q Django==$DJANGO --use-mirrors - pip install -q Django==$DJANGO --use-mirrors
script: script:

8
rest_auth/tests.py
View File

@ -1,12 +1,5 @@
import json import json
import os
import sys
from datetime import datetime, date, time from datetime import datetime, date, time
from urlparse import urlparse
os.environ['DJANGO_SETTINGS_MODULE'] = 'test_settings'
test_dir = os.path.dirname(__file__)
sys.path.insert(0, test_dir)
from django.conf import settings from django.conf import settings
from django.core.urlresolvers import reverse from django.core.urlresolvers import reverse
@ -15,7 +8,6 @@ from django.test import TestCase
from django.contrib.auth.models import User from django.contrib.auth.models import User
from django.contrib.auth import get_user_model from django.contrib.auth import get_user_model
from django.core import mail from django.core import mail
from django.core.urlresolvers import resolve
from registration.models import RegistrationProfile from registration.models import RegistrationProfile
from rest_framework.serializers import _resolve_model from rest_framework.serializers import _resolve_model