Skip to content

Commit

Permalink
Moved tests to the toplevel.
Browse files Browse the repository at this point in the history
  • Loading branch information
apollo13 committed Mar 25, 2013
1 parent 08579a1 commit 2c68df1
Show file tree
Hide file tree
Showing 5 changed files with 12 additions and 12 deletions.
14 changes: 7 additions & 7 deletions runtests.py
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,8 @@
import sys

from django.conf import settings
from django.core.management import execute_from_command_line


if not settings.configured:
settings.configure(
Expand All @@ -14,18 +16,16 @@
INSTALLED_APPS=[
'django.contrib.contenttypes',
'taggit',
'taggit.tests',
'tests',
]
)


from django.test.simple import DjangoTestSuiteRunner

def runtests():
runner = DjangoTestSuiteRunner()
failures = runner.run_tests(['tests'], verbosity=1, interactive=True)
sys.exit(failures)
argv = sys.argv[:1] + ['test'] + sys.argv[1:]
execute_from_command_line(argv)


if __name__ == '__main__':
runtests(*sys.argv[1:])
runtests()

File renamed without changes.
4 changes: 2 additions & 2 deletions taggit/tests/forms.py → tests/forms.py
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
from __future__ import unicode_literals
from __future__ import unicode_literals, absolute_import

from django import forms

from taggit.tests.models import Food, DirectFood, CustomPKFood, OfficialFood
from .models import Food, DirectFood, CustomPKFood, OfficialFood


class FoodForm(forms.ModelForm):
Expand Down
File renamed without changes.
6 changes: 3 additions & 3 deletions taggit/tests/tests.py → tests/tests.py
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
from __future__ import unicode_literals
from __future__ import unicode_literals, absolute_import

from unittest import TestCase as UnitTestCase

Expand All @@ -12,9 +12,9 @@

from taggit.managers import TaggableManager
from taggit.models import Tag, TaggedItem
from taggit.tests.forms import (FoodForm, DirectFoodForm, CustomPKFoodForm,
from .forms import (FoodForm, DirectFoodForm, CustomPKFoodForm,
OfficialFoodForm)
from taggit.tests.models import (Food, Pet, HousePet, DirectFood, DirectPet,
from .models import (Food, Pet, HousePet, DirectFood, DirectPet,
DirectHousePet, TaggedPet, CustomPKFood, CustomPKPet, CustomPKHousePet,
TaggedCustomPKPet, OfficialFood, OfficialPet, OfficialHousePet,
OfficialThroughModel, OfficialTag, Photo, Movie, Article)
Expand Down

0 comments on commit 2c68df1

Please sign in to comment.