|
1 | 1 | import copy
|
2 | 2 | import os
|
| 3 | +import re |
3 | 4 | import time
|
4 | 5 | import unittest
|
5 | 6 |
|
@@ -151,9 +152,9 @@ def test_copy_replace_all_fields_visible(self):
|
151 | 152 | self.assertEqual(copy.replace(t, user=1, system=2), (1, 2, *range(2, n_fields)))
|
152 | 153 |
|
153 | 154 | # unknown fields
|
154 |
| - with self.assertRaisesRegex(ValueError, 'unexpected field name'): |
| 155 | + with self.assertRaisesRegex(TypeError, 'unexpected field name'): |
155 | 156 | copy.replace(t, error=-1)
|
156 |
| - with self.assertRaisesRegex(ValueError, 'unexpected field name'): |
| 157 | + with self.assertRaisesRegex(TypeError, 'unexpected field name'): |
157 | 158 | copy.replace(t, user=1, error=-1)
|
158 | 159 |
|
159 | 160 | def test_copy_replace_with_invisible_fields(self):
|
@@ -182,23 +183,24 @@ def test_copy_replace_with_invisible_fields(self):
|
182 | 183 | self.assertEqual(t3.tm_zone, 'some other zone')
|
183 | 184 |
|
184 | 185 | # unknown fields
|
185 |
| - with self.assertRaisesRegex(ValueError, 'unexpected field name'): |
| 186 | + with self.assertRaisesRegex(TypeError, 'unexpected field name'): |
186 | 187 | copy.replace(t, error=2)
|
187 |
| - with self.assertRaisesRegex(ValueError, 'unexpected field name'): |
| 188 | + with self.assertRaisesRegex(TypeError, 'unexpected field name'): |
188 | 189 | copy.replace(t, tm_year=2000, error=2)
|
189 |
| - with self.assertRaisesRegex(ValueError, 'unexpected field name'): |
| 190 | + with self.assertRaisesRegex(TypeError, 'unexpected field name'): |
190 | 191 | copy.replace(t, tm_zone='some other zone', error=2)
|
191 | 192 |
|
192 | 193 | def test_copy_replace_with_unnamed_fields(self):
|
193 | 194 | assert os.stat_result.n_unnamed_fields > 0
|
194 | 195 | r = os.stat_result(range(os.stat_result.n_sequence_fields))
|
195 |
| - with self.assertRaisesRegex(TypeError, '__replace__() is not supported'): |
| 196 | + error_message = re.escape('__replace__() is not supported') |
| 197 | + with self.assertRaisesRegex(TypeError, error_message): |
196 | 198 | copy.replace(r)
|
197 |
| - with self.assertRaisesRegex(TypeError, '__replace__() is not supported'): |
| 199 | + with self.assertRaisesRegex(TypeError, error_message): |
198 | 200 | copy.replace(r, st_mode=1)
|
199 |
| - with self.assertRaisesRegex(TypeError, '__replace__() is not supported'): |
| 201 | + with self.assertRaisesRegex(TypeError, error_message): |
200 | 202 | copy.replace(r, error=2)
|
201 |
| - with self.assertRaisesRegex(TypeError, '__replace__() is not supported'): |
| 203 | + with self.assertRaisesRegex(TypeError, error_message): |
202 | 204 | copy.replace(r, st_mode=1, error=2)
|
203 | 205 |
|
204 | 206 |
|
|
0 commit comments