move postgres fields tests to separate folder similar to DRF

Author: Villiers Strauss

test/__init__.py

@@ -0,0 +1,52 @@
+"""
+Checks that Pylint does not complain Postgres model fields.
+"""
+#  pylint: disable=C0111,W5101
+from __future__ import print_function
+
+from django.contrib.postgres import fields
+from django.db import models
+
+
+class PostgresFieldsModel(models.Model):
+    arrayfield = fields.ArrayField(models.CharField())
+    hstorefield = fields.HStoreField()
+    jsonfield = fields.JSONField()
+    rangefield = fields.RangeField()
+    integerrangefield = fields.IntegerRangeField()
+    bigintegerrangefield = fields.BigIntegerRangeField()
+    floatrangefield = fields.FloatRangeField()
+    datetimerangefield = fields.DateTimeRangeField()
+    daterangefield = fields.DateRangeField()
+
+    def arrayfield_tests(self):
+        sorted_array = self.arrayfield.sort()
+        print(sorted_array)
+
+    def dictfield_tests(self):
+        print(self.hstorefield.keys())
+        print(self.hstorefield.values())
+        print(self.hstorefield.update({'foo': 'bar'}))
+
+        print(self.jsonfield.keys())
+        print(self.jsonfield.values())
+        print(self.jsonfield.update({'foo': 'bar'}))
+
+    def rangefield_tests(self):
+        print(self.rangefield.lower)
+        print(self.rangefield.upper)
+
+        print(self.integerrangefield.lower)
+        print(self.integerrangefield.upper)
+
+        print(self.bigintegerrangefield.lower)
+        print(self.bigintegerrangefield.upper)
+
+        print(self.floatrangefield.lower)
+        print(self.floatrangefield.upper)
+
+        print(self.datetimerangefield.lower)
+        print(self.datetimerangefield.upper)
+
+        print(self.daterangefield.lower)
+        print(self.daterangefield.upper)

test/external_psycopg2/__init__.py

@@ -89,53 +89,3 @@ def uuidfield_tests(self):
         # print(self.uuidfield.int)  # Don't know how to properly check this one
         print(self.uuidfield.variant)
         print(self.uuidfield.version)
-
-
-try:
-    # Imports psycopg2, which might not be installed
-    from django.contrib.postgres import fields
-except ImportError:
-    pass
-else:
-    class PostgresFieldsModel(models.Model):
-        arrayfield = fields.ArrayField(models.CharField())
-        hstorefield = fields.HStoreField()
-        jsonfield = fields.JSONField()
-        rangefield = fields.RangeField()
-        integerrangefield = fields.IntegerRangeField()
-        bigintegerrangefield = fields.BigIntegerRangeField()
-        floatrangefield = fields.FloatRangeField()
-        datetimerangefield = fields.DateTimeRangeField()
-        daterangefield = fields.DateRangeField()
-
-        def arrayfield_tests(self):
-            sorted_array = self.arrayfield.sort()
-            print(sorted_array)
-
-        def dictfield_tests(self):
-            print(self.hstorefield.keys())
-            print(self.hstorefield.values())
-            print(self.hstorefield.update({'foo': 'bar'}))
-
-            print(self.jsonfield.keys())
-            print(self.jsonfield.values())
-            print(self.jsonfield.update({'foo': 'bar'}))
-
-        def rangefield_tests(self):
-            print(self.rangefield.lower)
-            print(self.rangefield.upper)
-
-            print(self.integerrangefield.lower)
-            print(self.integerrangefield.upper)
-
-            print(self.bigintegerrangefield.lower)
-            print(self.bigintegerrangefield.upper)
-
-            print(self.floatrangefield.lower)
-            print(self.floatrangefield.upper)
-
-            print(self.datetimerangefield.lower)
-            print(self.datetimerangefield.upper)
-
-            print(self.daterangefield.lower)
-            print(self.daterangefield.upper)

test/external_psycopg2/func_noerror_postgres_fields.py

@@ -66,6 +66,9 @@ def suite():
     if module_exists('rest_framework'):
         test_list += tests('external_drf', '')
 
+    if module_exists('psycopg2'):
+        test_list += tests('external_psycopg2', '')
+
     return unittest.TestSuite([unittest.makeSuite(test, suiteClass=unittest.TestSuite)
                                for test in test_list])