[1.7.x] Adjusted refactoring of vendor checks.

Thanks Shai for the thorough review.

Backport of fb90b7c from master

3 files changed, 5 insertions, 5 deletions

diff --git a/tests/inspectdb/tests.py b/tests/inspectdb/tests.py
index 856e63ce4a..92a5a02dbd 100644
--- a/tests/inspectdb/tests.py
+++ b/tests/inspectdb/tests.py
@@ -87,7 +87,7 @@ class InspectDBTestCase(TestCase):
         else:
             assertFieldType('big_int_field', "models.IntegerField()")
 
-        if connection.features.supports_boolean_type:
+        if connection.features.can_introspect_boolean_field:
             assertFieldType('bool_field', "models.BooleanField()")
             assertFieldType('null_bool_field', "models.NullBooleanField()")
         else:
@@ -176,7 +176,7 @@ class InspectDBTestCase(TestCase):
         out = StringIO()
         call_command('inspectdb', stdout=out)
         output = out.getvalue()
-        base_name = 'field' if connection.features.lowercases_column_names else 'Field'
+        base_name = 'field' if not connection.features.uppercases_column_names else 'Field'
         self.assertIn("field = models.IntegerField()", output)
         self.assertIn("field_field = models.IntegerField(db_column='%s_')" % base_name, output)
         self.assertIn("field_field_0 = models.IntegerField(db_column='%s__')" % base_name, output)
diff --git a/tests/introspection/tests.py b/tests/introspection/tests.py
index fe7c3cefba..fee6e59544 100644
--- a/tests/introspection/tests.py
+++ b/tests/introspection/tests.py
@@ -57,7 +57,8 @@ class IntrospectionTests(TestCase):
         self.assertEqual(
             [datatype(r[1], r) for r in desc],
             ['AutoField' if connection.features.can_introspect_autofield else 'IntegerField',
-             'CharField', 'CharField', 'CharField', 'BigIntegerField',
+             'CharField', 'CharField', 'CharField',
+             'BigIntegerField' if connection.features.can_introspect_big_integer_field else 'IntegerField',
              'BinaryField' if connection.features.can_introspect_binary_field else 'TextField']
         )
 
diff --git a/tests/serializers_regress/tests.py b/tests/serializers_regress/tests.py
index 5ee2a93a6f..22db69ba13 100644
--- a/tests/serializers_regress/tests.py
+++ b/tests/serializers_regress/tests.py
@@ -449,6 +449,7 @@ class SerializerTests(TestCase):
         self.assertEqual(base_data, proxy_proxy_data.replace('proxy', ''))
 
 
+@skipUnlessDBFeature('supports_binary_field')
 def serializerTest(format, self):
 
     # Create all the objects defined in the test data
@@ -481,8 +482,6 @@ def serializerTest(format, self):
     for klass, count in instance_count.items():
         self.assertEqual(count, klass.objects.count())
 
-serializerTest = skipUnlessDBFeature('supports_binary_field')(serializerTest)
-
 
 def naturalKeySerializerTest(format, self):
     # Create all the objects defined in the test data