Parcourir la source

Move tests into the module

Ewoud Kohl van Wijngaarden il y a 12 ans
Parent
commit
89c0c291bf
6 fichiers modifiés avec 21 ajouts et 18 suppressions
  1. 8 9
      tests/models.py
  2. 1 1
      tests/tests.py
  3. 0 0
      tests/__init__.py
  4. 0 8
      tests/settings.py
  5. 0 0
      tests/urls.py
  6. 12 0
      testsettings.py

+ 8 - 9
tests/models.py

@@ -1,38 +1,37 @@
-from IPy import IP
+from django.db.models import Model
 
-from django.db import models, connection, DEFAULT_DB_ALIAS
+from netfields import InetAddressField, CidrAddressField, MACAddressField, \
+        NetManager
 
-from netfields import *
-
-class InetTestModel(models.Model):
+class InetTestModel(Model):
     field = InetAddressField()
     objects = NetManager()
 
     class Meta:
         db_table = 'inet'
 
-class NullInetTestModel(models.Model):
+class NullInetTestModel(Model):
     field = InetAddressField(null=True)
     objects = NetManager()
 
     class Meta:
         db_table = 'nullinet'
 
-class CidrTestModel(models.Model):
+class CidrTestModel(Model):
     field = CidrAddressField()
     objects = NetManager()
 
     class Meta:
         db_table = 'cidr'
 
-class NullCidrTestModel(models.Model):
+class NullCidrTestModel(Model):
     field = CidrAddressField(null=True)
     objects = NetManager()
 
     class Meta:
         db_table = 'nullcidr'
 
-class MACTestModel(models.Model):
+class MACTestModel(Model):
     mac = MACAddressField(null=True)
     objects = NetManager()
 

+ 1 - 1
tests/tests.py

@@ -3,7 +3,7 @@ from IPy import IP
 
 from django.db import IntegrityError
 
-from models import *
+from .models import *
 
 class BaseTestCase(object):
     select = 'SELECT "table"."id", "table"."field" FROM "table" '

+ 0 - 0
tests/__init__.py


+ 0 - 8
tests/settings.py

@@ -1,8 +0,0 @@
-DATABASES = {
-    'default': {
-        'ENGINE': 'django.db.backends.sqlite3',
-        'NAME': 'netfields',
-    }
-}
-
-INSTALLED_APPS = ('tests',)

+ 0 - 0
tests/urls.py


+ 12 - 0
testsettings.py

@@ -0,0 +1,12 @@
+DATABASES = {
+    'default': {
+        'ENGINE': 'django.db.backends.sqlite3',
+        'NAME': ':memory:',
+    }
+}
+
+INSTALLED_APPS = (
+    'netfields',
+)
+
+SECRET_KEY = "notimportant"