From 89f40e36246100df6a11316c31a76712ebc6c501 Mon Sep 17 00:00:00 2001 From: Florian Apolloner Date: Tue, 26 Feb 2013 09:53:47 +0100 Subject: Merged regressiontests and modeltests into the test root. --- tests/admin_scripts/complex_app/__init__.py | 0 tests/admin_scripts/complex_app/admin/__init__.py | 0 tests/admin_scripts/complex_app/admin/foo.py | 8 ++++++++ tests/admin_scripts/complex_app/models/__init__.py | 4 ++++ tests/admin_scripts/complex_app/models/bar.py | 11 +++++++++++ tests/admin_scripts/complex_app/models/foo.py | 7 +++++++ 6 files changed, 30 insertions(+) create mode 100644 tests/admin_scripts/complex_app/__init__.py create mode 100644 tests/admin_scripts/complex_app/admin/__init__.py create mode 100644 tests/admin_scripts/complex_app/admin/foo.py create mode 100644 tests/admin_scripts/complex_app/models/__init__.py create mode 100644 tests/admin_scripts/complex_app/models/bar.py create mode 100644 tests/admin_scripts/complex_app/models/foo.py (limited to 'tests/admin_scripts/complex_app') diff --git a/tests/admin_scripts/complex_app/__init__.py b/tests/admin_scripts/complex_app/__init__.py new file mode 100644 index 0000000000..e69de29bb2 diff --git a/tests/admin_scripts/complex_app/admin/__init__.py b/tests/admin_scripts/complex_app/admin/__init__.py new file mode 100644 index 0000000000..e69de29bb2 diff --git a/tests/admin_scripts/complex_app/admin/foo.py b/tests/admin_scripts/complex_app/admin/foo.py new file mode 100644 index 0000000000..1ed704a66b --- /dev/null +++ b/tests/admin_scripts/complex_app/admin/foo.py @@ -0,0 +1,8 @@ +from __future__ import absolute_import + +from django.contrib import admin + +from ..models.foo import Foo + + +admin.site.register(Foo) diff --git a/tests/admin_scripts/complex_app/models/__init__.py b/tests/admin_scripts/complex_app/models/__init__.py new file mode 100644 index 0000000000..7b647e74b1 --- /dev/null +++ b/tests/admin_scripts/complex_app/models/__init__.py @@ -0,0 +1,4 @@ +from .bar import Bar +from .foo import Foo + +__all__ = ['Foo', 'Bar'] diff --git a/tests/admin_scripts/complex_app/models/bar.py b/tests/admin_scripts/complex_app/models/bar.py new file mode 100644 index 0000000000..15956f7a50 --- /dev/null +++ b/tests/admin_scripts/complex_app/models/bar.py @@ -0,0 +1,11 @@ +from __future__ import absolute_import + +from django.db import models + +from ..admin import foo + + +class Bar(models.Model): + name = models.CharField(max_length=5) + class Meta: + app_label = 'complex_app' diff --git a/tests/admin_scripts/complex_app/models/foo.py b/tests/admin_scripts/complex_app/models/foo.py new file mode 100644 index 0000000000..914cf3b8b5 --- /dev/null +++ b/tests/admin_scripts/complex_app/models/foo.py @@ -0,0 +1,7 @@ +from django.db import models + + +class Foo(models.Model): + name = models.CharField(max_length=5) + class Meta: + app_label = 'complex_app' -- cgit v1.3