Further doctest fixes.

Author: pp-mo

lib/iris/loading.py

@@ -312,23 +312,29 @@ class LoadPolicy(CombineOptions):
     .. testsetup::
 
         from iris import LOAD_POLICY
+        loadpolicy_old_settings = LOAD_POLICY.settings()
+
+    .. testcleanup::
+
+        # restore original settings, so as not to upset other tests
+        LOAD_POLICY.set(loadpolicy_old_settings)
 
     Examples
     --------
     >>> LOAD_POLICY.set("legacy")
     >>> print(LOAD_POLICY)
-    LoadPolicy(support_multiple_references=False, merge_concat_sequence='m', repeat_until_unchanged=False)
+    LoadPolicy(equalise_cubes_kwargs=None, merge_concat_sequence='m', merge_unique=False, repeat_until_unchanged=False, support_multiple_references=False)
     >>> LOAD_POLICY.support_multiple_references = True
     >>> print(LOAD_POLICY)
-    LoadPolicy(support_multiple_references=True, merge_concat_sequence='m', repeat_until_unchanged=False)
+    LoadPolicy(equalise_cubes_kwargs=None, merge_concat_sequence='m', merge_unique=False, repeat_until_unchanged=False, support_multiple_references=True)
     >>> LOAD_POLICY.set(merge_concat_sequence="cm")
     >>> print(LOAD_POLICY)
-    LoadPolicy(support_multiple_references=True, merge_concat_sequence='cm', repeat_until_unchanged=False)
+    LoadPolicy(equalise_cubes_kwargs=None, merge_concat_sequence='cm', merge_unique=False, repeat_until_unchanged=False, support_multiple_references=True)
     >>> with LOAD_POLICY.context("comprehensive"):
     ...    print(LOAD_POLICY)
-    LoadPolicy(support_multiple_references=True, merge_concat_sequence='mc', repeat_until_unchanged=True)
+    LoadPolicy(equalise_cubes_kwargs={'apply_all': True}, merge_concat_sequence='mc', merge_unique=False, repeat_until_unchanged=True, support_multiple_references=True)
     >>> print(LOAD_POLICY)
-    LoadPolicy(support_multiple_references=True, merge_concat_sequence='cm', repeat_until_unchanged=False)
+    LoadPolicy(equalise_cubes_kwargs=None, merge_concat_sequence='cm', merge_unique=False, repeat_until_unchanged=False, support_multiple_references=True)
     """
 
     # Option keys are as for CombineOptions, plus the multiple-refs control

lib/iris/util.py

@@ -2407,6 +2407,12 @@ def testcube(timepts):
             return cube
 
         cubes = CubeList([testcube([1., 2]), testcube([13., 14, 15])])
+        combinecubes_old_policysettings = iris.LOAD_POLICY.settings()
+
+    .. testcleanup::
+
+        # restore old state to avoid upsetting other tests
+        iris.LOAD_POLICY.set(combinecubes_old_policysettings)
 
     >>> # Take a pair of sample cubes which can concatenate together
     >>> print(cubes)