Revert "move tests app to tests.extend"

This reverts commit e0f7630.
tomi77 · May 7, 2017 · 9df1c75 · 9df1c75
1 parent e0f7630
commit 9df1c75
Show file tree

Hide file tree

Showing 10 changed files with 5 additions and 6 deletions.
diff --git a/manage.py b/manage.py
@@ -1,8 +1,7 @@
 #!/usr/bin/env python
 import os
 
-if os.environ.get('DJANGO_SETTINGS_MODULE') is None:
-    os.environ['DJANGO_SETTINGS_MODULE'] = 'tests.extend.settings'
+os.environ['DJANGO_SETTINGS_MODULE'] = 'tests.settings'
 from django.core import management
 
 if __name__ == "__main__":

diff --git a/tests/extend/south_migrations/__init__.py b/tests/extend/south_migrations/__init__.py
diff --git a/tests/extend/fixtures/role.yaml → tests/fixtures/role.yaml b/tests/extend/fixtures/role.yaml → tests/fixtures/role.yaml
@@ -94,12 +94,12 @@
     is_staff: true
 
 - pk: 1
-  model: 'extend.MyUser'
+  model: 'tests.MyUser'
   fields:
     user: 1
     role: 1
 - pk: 2
-  model: 'extend.MyUser'
+  model: 'tests.MyUser'
   fields:
     user: 2
     role: 2
diff --git a/tests/extend/migrations/0001_initial.py → tests/migrations/0001_initial.py b/tests/extend/migrations/0001_initial.py → tests/migrations/0001_initial.py
diff --git a/tests/extend/__init__.py → tests/migrations/__init__.py b/tests/extend/__init__.py → tests/migrations/__init__.py
diff --git a/tests/extend/models.py → tests/models.py b/tests/extend/models.py → tests/models.py
diff --git a/tests/extend/settings.py → tests/settings.py b/tests/extend/settings.py → tests/settings.py
@@ -14,7 +14,7 @@
     'django.contrib.auth',
     'django.contrib.contenttypes',
     'authrole',
-    'tests.extend',
+    'tests',
 ]
 
 TEMPLATES = [

diff --git a/...s/extend/south_migrations/0001_initial.py → tests/south_migrations/0001_initial.py b/...s/extend/south_migrations/0001_initial.py → tests/south_migrations/0001_initial.py
@@ -65,7 +65,7 @@ def backwards(self, orm):
             'model': ('django.db.models.fields.CharField', [], {'max_length': '100'}),
             'name': ('django.db.models.fields.CharField', [], {'max_length': '100'})
         },
-        'extend.myuser': {
+        'tests.myuser': {
             'Meta': {'object_name': 'MyUser'},
             'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
             'role': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'myusers'", 'to': "orm['authrole.Role']"}),

diff --git a/tests/extend/migrations/__init__.py → tests/south_migrations/__init__.py b/tests/extend/migrations/__init__.py → tests/south_migrations/__init__.py
diff --git a/tests/extend/tests.py → tests/tests.py b/tests/extend/tests.py → tests/tests.py