Fix test for new implementation.

pp-mo · pp-mo · commit 575fb091ec9a · 2018-03-13T23:30:26.000Z
diff --git a/lib/iris/tests/unit/fileformats/um/fast_load_structured_fields/test_group_structured_fields.py b/lib/iris/tests/unit/fileformats/um/fast_load_structured_fields/test_group_structured_fields.py
@@ -1,4 +1,4 @@
-# (C) British Crown Copyright 2014 - 2015, Met Office
+# (C) British Crown Copyright 2014 - 2018, Met Office
 #
 # This file is part of Iris.
 #
@@ -71,9 +71,7 @@ def _dummy_fields_iter(self, stashes=None, models=None, lbprocs=None):
 
     def _group_result(self, fields):
         # Run the testee, but returning just the groups (not FieldCollations).
-        with mock.patch('iris.fileformats.um._fast_load_structured_fields.'
-                        'FieldCollation', new=lambda args: args):
-            result = list(group_structured_fields(fields))
+        result = list(group_structured_fields(fields, collation_class=tuple))
         return result
 
     def _test_fields(self, item):

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-# (C) British Crown Copyright 2014 - 2015, Met Office`
	`1`	`+# (C) British Crown Copyright 2014 - 2018, Met Office`
`2`	`2`	`#`
`3`	`3`	`# This file is part of Iris.`
`4`	`4`	`#`
`@@ -71,9 +71,7 @@ def _dummy_fields_iter(self, stashes=None, models=None, lbprocs=None):`
`71`	`71`
`72`	`72`	`def _group_result(self, fields):`
`73`	`73`	`# Run the testee, but returning just the groups (not FieldCollations).`
`74`		`- with mock.patch('iris.fileformats.um._fast_load_structured_fields.'`
`75`		`- 'FieldCollation', new=lambda args: args):`
`76`		`- result = list(group_structured_fields(fields))`
	`74`	`+ result = list(group_structured_fields(fields, collation_class=tuple))`
`77`	`75`	`return result`
`78`	`76`
`79`	`77`	`def _test_fields(self, item):`