Add a test that six builtins were imported.

lib/iris/tests/test_coding_standards.py

@@ -379,6 +379,10 @@ class TestFutureImports(unittest.TestCase):
         r"print_function(,\s*unicode_literals)?\)$",
         flags=re.MULTILINE)
 
+    six_import_pattern = re.compile(
+        r"^from six.moves import \(filter, input, map, range, zip\)  # noqa$",
+        flags=re.MULTILINE)
+
     def test_future_imports(self):
         # Tests that every single Python file includes the appropriate
         # __future__ import to enforce consistent behaviour.
@@ -407,9 +411,15 @@ def test_future_imports(self):
                               'test.'.format(full_fname))
                         failed = True
 
+                    if re.search(self.six_import_pattern, content) is None:
+                        print('The file {} has no valid six import '
+                              'and has not been excluded from the imports '
+                              'test.'.format(full_fname))
+                        failed = True
+
         if failed:
-            raise ValueError('There were __future__ import check failures. '
-                             'See stdout.')
+            raise ValueError('There were Python 3 compatibility import check '
+                             'failures. See stdout.')
 
 
 if __name__ == '__main__':