avoid unittest.mock.sentinel copy issue

SciTools · Aug 5, 2020 · 52a39e9 · 52a39e9
1 parent d56650d
commit 52a39e9
Showing 1 changed file with 8 additions and 8 deletions.
diff --git 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()