From 52a39e907fa277130c5370266fe2bdcf7519a47e Mon Sep 17 00:00:00 2001 From: Bill Little Date: Wed, 5 Aug 2020 23:49:41 +0100 Subject: [PATCH] avoid unittest.mock.sentinel copy issue --- .../unit/common/metadata/test_BaseMetadata.py | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/lib/iris/tests/unit/common/metadata/test_BaseMetadata.py b/lib/iris/tests/unit/common/metadata/test_BaseMetadata.py index 6f093dc27f..3469f15c7d 100644 --- a/lib/iris/tests/unit/common/metadata/test_BaseMetadata.py +++ b/lib/iris/tests/unit/common/metadata/test_BaseMetadata.py @@ -394,8 +394,8 @@ def test_names_different_none(self): class Test__combine_lenient_attributes(tests.IrisTest): def setUp(self): self.values = OrderedDict( - one=sentinel.one, - two=sentinel.two, + one="one", + two="two", three=np.int16(123), four=np.arange(10), five=ma.arange(10), @@ -446,8 +446,8 @@ def test_different_none(self): def test_extra(self): left = self.values.copy() right = self.values.copy() - left["extra_left"] = sentinel.extra_left - right["extra_right"] = sentinel.extra_right + left["extra_left"] = "extra_left" + right["extra_right"] = "extra_right" result = self.metadata._combine_lenient_attributes(left, right) expected = self.values.copy() @@ -462,8 +462,8 @@ def test_extra(self): class Test__combine_strict_attributes(tests.IrisTest): def setUp(self): self.values = OrderedDict( - one=sentinel.one, - two=sentinel.two, + one="one", + two="two", three=np.int32(123), four=np.arange(10), five=ma.arange(10), @@ -514,8 +514,8 @@ def test_different_none(self): def test_extra(self): left = self.values.copy() right = self.values.copy() - left["extra_left"] = sentinel.extra_left - right["extra_right"] = sentinel.extra_right + left["extra_left"] = "extra_left" + right["extra_right"] = "extra_right" result = self.metadata._combine_strict_attributes(left, right) expected = self.values.copy()