Test wrangling vs v3.0.x (#4249)

* test changes

* add awol init

* rename system test cases

* fix PartialDateTime tests

* fix typo

* add whatsnew

Author: rcomer

docs/iris/src/whatsnew/3.0.4.rst

@@ -31,6 +31,10 @@ This document explains the changes made to Iris for this release
       to allow use of the latest versions of `cftime`_, `cf-units`_ and `nc-time-axis`_.
       (:pull:`4222`)
 
+   #. `@rcomer`_ modified test modules so they run consistently under ``pytest`` and
+      ``nose``, and also fixed some minor issues with :class:`~iris.time.PartialDateTime`.
+      (:pull:`4249`)
+
    Note that, we are forced to drop support for ``Python 3.6`` in this patch due to
    the third-party package dependencies required by (:pull:`4222`).
 

lib/iris/tests/system_test.py

@@ -22,7 +22,7 @@
 
 
 class SystemInitialTest(tests.IrisTest):
-    def system_test_supported_filetypes(self):
+    def test_supported_filetypes(self):
         nx, ny = 60, 60
         data = np.arange(nx * ny, dtype=">f4").reshape(nx, ny)
 
@@ -74,7 +74,7 @@ def horiz_cs():
                 new_cube, ("system", "supported_filetype_%s.cml" % filetype)
             )
 
-    def system_test_imports_general(self):
+    def test_imports_general(self):
         if tests.MPL_AVAILABLE:
             import matplotlib  # noqa
         import netCDF4  # noqa

lib/iris/tests/test_merge.py

@@ -25,7 +25,7 @@
 import iris.tests.stock
 
 
-class TestMixin:
+class MergeMixin:
     """
     Mix-in class for attributes & utilities common to these test cases.
 
@@ -55,15 +55,15 @@ def test_duplication(self):
 
 
 @tests.skip_data
-class TestSingleCube(tests.IrisTest, TestMixin):
+class TestSingleCube(tests.IrisTest, MergeMixin):
     def setUp(self):
         self._data_path = tests.get_data_path(("PP", "globClim1", "theta.pp"))
         self._num_cubes = 1
         self._prefix = "theta"
 
 
 @tests.skip_data
-class TestMultiCube(tests.IrisTest, TestMixin):
+class TestMultiCube(tests.IrisTest, MergeMixin):
     def setUp(self):
         self._data_path = tests.get_data_path(
             ("PP", "globClim1", "dec_subset.pp")

lib/iris/tests/unit/analysis/scipy_interpolate/__init__.py

@@ -0,0 +1,6 @@
+# Copyright Iris contributors
+#
+# This file is part of Iris and is released under the LGPL license.
+# See COPYING and COPYING.LESSER in the root of the repository for full
+# licensing details.
+"""Unit tests for the :mod:`iris.analysis.scipy_interpolate` module."""

lib/iris/tests/unit/time/__init__.py

@@ -0,0 +1,6 @@
+# Copyright Iris contributors
+#
+# This file is part of Iris and is released under the LGPL license.
+# See COPYING and COPYING.LESSER in the root of the repository for full
+# licensing details.
+"""Unit tests for the :mod:`iris.time` module."""

lib/iris/tests/unit/time/test_PartialDateTime.py

@@ -224,12 +224,12 @@ def setUp(self):
         self.expected_value = EQ_EXPECTATIONS
 
     def test_cftime_equal(self):
-        pdt = PartialDateTime(month=3, microsecond=2)
+        pdt = PartialDateTime(month=3, second=2)
         other = cftime.datetime(year=2013, month=3, day=20, second=2)
         self.assertTrue(pdt == other)
 
     def test_cftime_not_equal(self):
-        pdt = PartialDateTime(month=3, microsecond=2)
+        pdt = PartialDateTime(month=3, second=2)
         other = cftime.datetime(year=2013, month=4, day=20, second=2)
         self.assertFalse(pdt == other)
 

lib/iris/time.py

@@ -155,23 +155,21 @@ def __eq__(self, other):
                     other_attr = other.microsecond
                     if attr is not None and attr != other_attr:
                         result = False
+
             except AttributeError:
-                result = NotImplemented
+                result = other.__eq__(self)
+                if result is NotImplemented:
+                    # Equality is undefined between these objects.  We don't
+                    # want Python to fall back to the default `object`
+                    # behaviour (which compares using object IDs), so we raise
+                    # an exception here instead.
+                    fmt = "unable to compare PartialDateTime with {}"
+                    raise TypeError(fmt.format(type(other)))
+
         return result
 
     def __ne__(self, other):
         result = self.__eq__(other)
         if result is not NotImplemented:
             result = not result
         return result
-
-    def __cmp__(self, other):
-        # Since we've defined all the rich comparison operators (via
-        # functools.total_ordering), we can only reach this point if
-        # neither this class nor the other class had a rich comparison
-        # that could handle the type combination.
-        # We don't want Python to fall back to the default `object`
-        # behaviour (which compares using object IDs), so we raise an
-        # exception here instead.
-        fmt = "unable to compare PartialDateTime with {}"
-        raise TypeError(fmt.format(type(other)))