Merge pull request coagulant#44 from hovel/fix_tests

fix tests

.gitignore

@@ -1,10 +1,70 @@
-*.pyc
-.coverage
 .ve
-.cache
 reports
-coverage.xml
-nosetests.xml
 pylint.out
 distribute-*.tar.gz
-docs/.*/
+docs/.*/
+
+# Byte-compiled / optimized / DLL files
+__pycache__/
+*.py[cod]
+*$py.class
+
+# C extensions
+*.so
+
+# Distribution / packaging
+.Python
+env/
+build/
+develop-eggs/
+dist/
+downloads/
+eggs/
+.eggs/
+lib/
+lib64/
+parts/
+sdist/
+var/
+*.egg-info/
+.installed.cfg
+*.egg
+
+# PyInstaller
+#  Usually these files are written by a python script from a template
+#  before PyInstaller builds the exe, so as to inject date/other infos into it.
+*.manifest
+*.spec
+
+# Installer logs
+pip-log.txt
+pip-delete-this-directory.txt
+
+# Unit test / coverage reports
+htmlcov/
+.tox/
+.coverage
+.coverage.*
+.cache
+nosetests.xml
+coverage.xml
+*,cover
+
+# Translations
+#*.mo
+#*.pot
+
+# Django stuff:
+*.log
+
+# Sphinx documentation
+docs/_build/
+
+# PyBuilder
+target/
+
+# PyCharm
+.idea/
+
+*.db
+*.sqlite3

.travis.yml

@@ -1,11 +1,14 @@
 language: python
+sudo: false
 python:
   - "2.7"
 env:
-  - DJANGO="Django==1.7" DB=mysql
-  - DJANGO="Django==1.8" DB=mysql
+  - DJANGO="Django>=1.7,<1.8" DB=sqlite
+  - DJANGO="Django>=1.8,<1.9" DB=sqlite
+  - DJANGO="Django>=1.9,<1.10" DB=sqlite
 install:
+  - export PYTHONPATH=./django_any/:$PYTHONPATH
   - pip install -U $DJANGO
-  - pip install -r tests/requirements.pip --use-mirrors
+  - pip install -r tests/requirements.pip
 script:
-  - python tests/manage.py test
+  - python tests/manage.py test django_any

django_any/contrib/auth.py

@@ -1,14 +1,14 @@
 # -*- coding: utf-8 -*-
 from django.contrib.auth.models import User, Permission, Group
-from django_any import any_model
+from django_any.models import any_model
 
 def any_user(password=None, permissions=[], groups=[], **kwargs):
     """
     Shortcut for creating Users
 
     Permissions could be a list of permission names
 
-    If not specified, creates active, non superuser 
+    If not specified, creates active, non superuser
     and non staff user
     """
 
@@ -32,7 +32,6 @@ def any_user(password=None, permissions=[], groups=[], **kwargs):
 
     if password:
         user.set_password(password)
-    
+
     user.save()
     return user
-

django_any/models.py

@@ -344,7 +344,10 @@ def any_genericipaddress_field(field, **kwargs):
             raise Exception('Unexpected validators')
 
         if protocol == 'ipv4':
-            return any_ipaddress_field(field)
+            if django.VERSION < (1, 9):
+                return any_ipaddress_field(field)
+            else:
+                return any_genericipaddress_field(field)
         if protocol == 'ipv6':
             nums = [str(xunit.any_string(hexdigits, min_length=4, max_length=4)) for _ in xrange(0, 8)]
             return ":".join(nums)

django_any/tests/test_client.py

@@ -1,5 +1,6 @@
 # -*- coding: utf-8; mode: django -*-
-from django.conf.urls.defaults import patterns, include
+import django
+from django.conf.urls import url
 from django.contrib import admin
 from django.contrib.auth.models import User
 from django.test import TestCase
@@ -29,12 +30,17 @@ class TestForm(forms.Form):
 
     return HttpResponse(template.render(context))
 
-
-urlpatterns = patterns('',
-     (r'^admin/', include(admin.site.urls)),
-     (r'^view/', view),
-)
-
+if django.VERSION < (1, 9):
+    from django.conf.urls import patterns, include
+    urlpatterns = patterns('',
+         url(r'^admin/', include(admin.site.urls)),
+         url(r'^view/', view),
+    )
+else:
+    urlpatterns = [
+         url(r'^admin/', admin.site.urls),
+         url(r'^view/', view),
+    ]
 
 class DjangoAnyClient(TestCase):
     urls = 'django_any.tests.test_client'
@@ -43,7 +49,8 @@ def setUp(self):
         self.client = Client()
 
     def test_login_as_super_user(self):
-        self.assertTrue(self.client.login_as(is_superuser=True))
+        # TODO make test page which will not require is_staff like /admin
+        self.assertTrue(self.client.login_as(is_superuser=True, is_staff=True))
 
         response = self.client.get('/admin/')
         self.assertEquals(200, response.status_code)
@@ -59,4 +66,3 @@ def test_login_as_failed(self):
     def test_post_any_data(self):
         response = self.client.post_any_data('/view/')
         self.assertRedirects(response, '/view/')
-

django_any/tests/contrib_any_user.py → django_any/tests/test_contrib_any_user.py

@@ -2,7 +2,7 @@
 from django.db import models
 from django.contrib.auth.models import User
 from django.test import TestCase
-from django_any import any_model
+from django_any.models import any_model
 from django_any.contrib.auth import any_user
 
 

django_any/tests/contrib_defaults.py → django_any/tests/test_contrib_defaults.py

@@ -1,12 +1,13 @@
 # -*- coding: utf-8; -*-
+import django
 from django.db import models
 from django.test import TestCase
 import datetime
 from decimal import Decimal
 from django_any.contrib.default import any_model_with_defaults
 from django.db.models.fields import NOT_PROVIDED
 from django.core.files.base import ContentFile
-from django_any.tests.model_creation_simple import SimpleModel
+from django_any.tests.test_model_creation_simple import SimpleModel
 
 
 class SimpleModelWithDefaults(models.Model):
@@ -20,7 +21,10 @@ class SimpleModelWithDefaults(models.Model):
     email_field = models.EmailField(default='admin@dev.null')
     float_field = models.FloatField(default=0.7)
     integer_field = models.IntegerField(default=42)
-    ip_field = models.IPAddressField(default='127.0.0.1')
+    if django.VERSION < (1, 9):
+        ip_field = models.IPAddressField(default='127.0.0.1')
+    else:
+        ip_field = models.GenericIPAddressField(default='127.0.0.1')
     null_boolead_field = models.NullBooleanField(default=None)
     positive_integer_field = models.PositiveIntegerField(default=4)
     small_integer = models.PositiveSmallIntegerField(default=1)

django_any/tests/test_custom_seed.py

@@ -1,7 +1,7 @@
 # -*- coding: utf-8; mode: django -*-
 from django.db import models
 from django.test import TestCase
-from django_any import any_field
+from django_any.models import any_field
 from django_any.test import WithTestDataSeed, with_seed, without_random_seed
 
 

django_any/tests/field_attr_choices.py → django_any/tests/test_field_attr_choices.py

@@ -4,7 +4,7 @@
 """
 from django.test import TestCase
 from django.db import models
-from django_any import any_field
+from django_any.models import any_field
 
 class AttrChoices(TestCase):
     def test_one_case_selection(self):

django_any/tests/model_creation_constraint.py → django_any/tests/test_model_creation_constraint.py

@@ -5,7 +5,7 @@
 from django.core.exceptions import ValidationError
 from django.db import models
 from django.test import TestCase
-from django_any import any_model
+from django_any.models import any_model
 
 
 class ModelWithConstraint(models.Model):

django_any/tests/model_creation_simple.py → django_any/tests/test_model_creation_simple.py

@@ -2,9 +2,10 @@
 """
 Create models will all fields with simply to generate values
 """
+import django
 from django.db import models
 from django.test import TestCase
-from django_any import any_model
+from django_any.models import any_model
 
 class SimpleModel(models.Model):
     big_integer_field = models.BigIntegerField()
@@ -17,7 +18,10 @@ class SimpleModel(models.Model):
     email_field = models.EmailField()
     float_field = models.FloatField()
     integer_field = models.IntegerField()
-    ip_field = models.IPAddressField()
+    if django.VERSION < (1, 9):
+        ip_field = models.IPAddressField()
+    else:
+        ip_field = models.GenericIPAddressField()
     null_boolead_field = models.NullBooleanField()
     positive_integer_field = models.PositiveIntegerField()
     small_integer = models.PositiveSmallIntegerField()

django_any/tests/model_customfield.py → django_any/tests/test_model_customfield.py

@@ -4,7 +4,7 @@
 """
 from django.db import models
 from django.test import TestCase
-from django_any import any_model
+from django_any.models import any_model
 
 class MySlugField(models.SlugField):
     pass

django_any/tests/model_field_content_object.py → django_any/tests/test_model_field_content_object.py

@@ -2,11 +2,11 @@
 """
 Test model creation with GenericForeignKey
 """
-from django.contrib.contenttypes import generic
+from django.contrib.contenttypes.fields import GenericForeignKey
 from django.contrib.contenttypes.models import ContentType
 from django.db import models
 from django.test import TestCase
-from django_any import any_model
+from django_any.models import any_model
 
 
 class RelatedContentModel(models.Model):
@@ -19,7 +19,7 @@ class ModelWithGenericRelation(models.Model):
     tag = models.SlugField()
     content_type = models.ForeignKey(ContentType)
     object_id = models.PositiveIntegerField()
-    content_object = generic.GenericForeignKey('content_type', 'object_id')
+    content_object = GenericForeignKey('content_type', 'object_id')
 
     class Meta:
         app_label = 'django_any'

django_any/tests/model_field_validatiors.py → django_any/tests/test_model_field_validatiors.py

@@ -5,7 +5,7 @@
 from django.core.exceptions import ValidationError
 from django.db import models
 from django.test import TestCase
-from django_any import any_model
+from django_any.models import any_model
 
 
 def validate_even(value):

django_any/tests/model_filefield.py → django_any/tests/test_model_filefield.py

@@ -5,7 +5,7 @@
 import os
 from django.db import models
 from django.test import TestCase
-from django_any import any_model
+from django_any.models import any_model
 
 class ModelUploadToString(models.Model):
     file_field = models.FileField(upload_to='sample_subdir')

django_any/tests/model_foreign_key.py → django_any/tests/test_model_foreign_key.py

@@ -4,7 +4,7 @@
 """
 from django.db import models
 from django.test import TestCase
-from django_any import any_model
+from django_any.models import any_model
 
 
 class RelatedModel(models.Model):

django_any/tests/model_oneto_one.py → django_any/tests/test_model_oneto_one.py

@@ -4,7 +4,7 @@
 """
 from django.db import models
 from django.test import TestCase
-from django_any import any_model
+from django_any.models import any_model
 
 
 class OneToOneRelated(models.Model):

django_any/tests/model_qobjects_spec.py → django_any/tests/test_model_qobjects_spec.py

@@ -5,7 +5,7 @@
 from django.db import models
 from django.db.models import Q
 from django.test import TestCase
-from django_any import any_model
+from django_any.models import any_model
 
 
 class QObjectRelated(models.Model):

django_any/tests/model_redefine_creation.py → django_any/tests/test_model_redefine_creation.py

@@ -1,7 +1,7 @@
 # -*- coding: utf-8; mode: django -*-
 from django.db import models
 from django.test import TestCase
-from django_any import any_model
+from django_any.models import any_model
 
 
 class Redefined(models.Model):

setup.py

@@ -2,7 +2,7 @@
 import codecs
 import os
 from setuptools import setup
-os.environ['DJANGO_SETTINGS_MODULE'] = "tests.settings"
+os.environ['DJANGO_SETTINGS_MODULE'] = "testproject.settings"
 
 read = lambda filepath: codecs.open(filepath, 'r', 'utf-8').read()
 
@@ -33,4 +33,3 @@
         'Framework :: Django',
     ]
 )
-

tests/manage.py

@@ -1,22 +1,10 @@
 #!/usr/bin/env python
-# -*- coding: utf-8 -*-
-from os import path
-import shutil, sys, subprocess
+import os
+import sys
 
-PROJECT_ROOT = path.dirname(path.abspath(path.dirname(__file__)))
-
-sys.path.insert(0, PROJECT_ROOT)
+if __name__ == "__main__":
+    os.environ.setdefault("DJANGO_SETTINGS_MODULE", "testproject.settings")
 
-# run django
-from django.core.management import execute_manager
-try:
-    import tests.settings
-except ImportError:
-    import sys
-    sys.stderr.write("Error: Can't find the file 'settings.py' in the directory")
-    sys.exit(1)
+    from django.core.management import execute_from_command_line
 
-if __name__ == "__main__":
-    if len(sys.argv) == 1:
-        sys.argv += ['test'] + list(tests.settings.PROJECT_APPS)
-    execute_manager(tests.settings)
+    execute_from_command_line(sys.argv)