02-fix-tests.patch 9.1 KB

123456789101112131415161718192021222324252627282930313233343536373839404142434445464748495051525354555657585960616263646566676869707172737475767778798081828384858687888990919293949596979899100101102103104105106107108109110111112113114115116117118119120121122123124125126127128129130131132133134135136137138139140141142143144145146147148149150151152153154155156157158159160161162163164165166167168169170171172173174175176177178179180181182183184185186187188189190191192193194195196197198199200201202203204205206207208209210211212213214215216
  1. --- contrib/deprecated/python/enum34/enum/test.py (index)
  2. +++ contrib/deprecated/python/enum34/enum/test.py (working tree)
  3. @@ -94,7 +94,9 @@ try:
  4. except Exception:
  5. pass
  6. -def test_pickle_dump_load(assertion, source, target=None,
  7. +import pytest
  8. +
  9. +def check_pickle_dump_load(assertion, source, target=None,
  10. protocol=(0, HIGHEST_PROTOCOL)):
  11. start, stop = protocol
  12. failures = []
  13. @@ -110,7 +112,7 @@ def test_pickle_dump_load(assertion, source, target=None,
  14. if failures:
  15. raise ValueError('Failed with protocols: %s' % ', '.join(failures))
  16. -def test_pickle_exception(assertion, exception, obj,
  17. +def check_pickle_exception(assertion, exception, obj,
  18. protocol=(0, HIGHEST_PROTOCOL)):
  19. start, stop = protocol
  20. failures = []
  21. @@ -610,32 +612,32 @@ class TestEnum(unittest.TestCase):
  22. def test_pickle_enum(self):
  23. if isinstance(Stooges, Exception):
  24. raise Stooges
  25. - test_pickle_dump_load(self.assertTrue, Stooges.CURLY)
  26. - test_pickle_dump_load(self.assertTrue, Stooges)
  27. + check_pickle_dump_load(self.assertTrue, Stooges.CURLY)
  28. + check_pickle_dump_load(self.assertTrue, Stooges)
  29. def test_pickle_int(self):
  30. if isinstance(IntStooges, Exception):
  31. raise IntStooges
  32. - test_pickle_dump_load(self.assertTrue, IntStooges.CURLY)
  33. - test_pickle_dump_load(self.assertTrue, IntStooges)
  34. + check_pickle_dump_load(self.assertTrue, IntStooges.CURLY)
  35. + check_pickle_dump_load(self.assertTrue, IntStooges)
  36. def test_pickle_float(self):
  37. if isinstance(FloatStooges, Exception):
  38. raise FloatStooges
  39. - test_pickle_dump_load(self.assertTrue, FloatStooges.CURLY)
  40. - test_pickle_dump_load(self.assertTrue, FloatStooges)
  41. + check_pickle_dump_load(self.assertTrue, FloatStooges.CURLY)
  42. + check_pickle_dump_load(self.assertTrue, FloatStooges)
  43. def test_pickle_enum_function(self):
  44. if isinstance(Answer, Exception):
  45. raise Answer
  46. - test_pickle_dump_load(self.assertTrue, Answer.him)
  47. - test_pickle_dump_load(self.assertTrue, Answer)
  48. + check_pickle_dump_load(self.assertTrue, Answer.him)
  49. + check_pickle_dump_load(self.assertTrue, Answer)
  50. def test_pickle_enum_function_with_module(self):
  51. if isinstance(Question, Exception):
  52. raise Question
  53. - test_pickle_dump_load(self.assertTrue, Question.who)
  54. - test_pickle_dump_load(self.assertTrue, Question)
  55. + check_pickle_dump_load(self.assertTrue, Question.who)
  56. + check_pickle_dump_load(self.assertTrue, Question)
  57. if pyver == 3.4:
  58. def test_class_nested_enum_and_pickle_protocol_four(self):
  59. @@ -646,10 +648,10 @@ class TestEnum(unittest.TestCase):
  60. self.__class__.NestedEnum = NestedEnum
  61. self.NestedEnum.__qualname__ = '%s.NestedEnum' % self.__class__.__name__
  62. - test_pickle_exception(
  63. + check_pickle_exception(
  64. self.assertRaises, PicklingError, self.NestedEnum.twigs,
  65. protocol=(0, 3))
  66. - test_pickle_dump_load(self.assertTrue, self.NestedEnum.twigs,
  67. + check_pickle_dump_load(self.assertTrue, self.NestedEnum.twigs,
  68. protocol=(4, HIGHEST_PROTOCOL))
  69. elif pyver == 3.5:
  70. @@ -661,15 +663,15 @@ class TestEnum(unittest.TestCase):
  71. self.__class__.NestedEnum = NestedEnum
  72. self.NestedEnum.__qualname__ = '%s.NestedEnum' % self.__class__.__name__
  73. - test_pickle_dump_load(self.assertTrue, self.NestedEnum.twigs,
  74. + check_pickle_dump_load(self.assertTrue, self.NestedEnum.twigs,
  75. protocol=(0, HIGHEST_PROTOCOL))
  76. def test_exploding_pickle(self):
  77. BadPickle = Enum('BadPickle', 'dill sweet bread_n_butter')
  78. enum._make_class_unpicklable(BadPickle)
  79. globals()['BadPickle'] = BadPickle
  80. - test_pickle_exception(self.assertRaises, TypeError, BadPickle.dill)
  81. - test_pickle_exception(self.assertRaises, PicklingError, BadPickle)
  82. + check_pickle_exception(self.assertRaises, TypeError, BadPickle.dill)
  83. + check_pickle_exception(self.assertRaises, PicklingError, BadPickle)
  84. def test_string_enum(self):
  85. class SkillLevel(str, Enum):
  86. @@ -1066,7 +1068,7 @@ class TestEnum(unittest.TestCase):
  87. self.assertEqual(Name.BDFL, 'Guido van Rossum')
  88. self.assertTrue(Name.BDFL, Name('Guido van Rossum'))
  89. self.assertTrue(Name.BDFL is getattr(Name, 'BDFL'))
  90. - test_pickle_dump_load(self.assertTrue, Name.BDFL)
  91. + check_pickle_dump_load(self.assertTrue, Name.BDFL)
  92. def test_extending(self):
  93. def bad_extension():
  94. @@ -1291,9 +1293,9 @@ class TestEnum(unittest.TestCase):
  95. globals()['NEI'] = NEI
  96. NI5 = NamedInt('test', 5)
  97. self.assertEqual(NI5, 5)
  98. - test_pickle_dump_load(self.assertTrue, NI5, 5)
  99. + check_pickle_dump_load(self.assertTrue, NI5, 5)
  100. self.assertEqual(NEI.y.value, 2)
  101. - test_pickle_dump_load(self.assertTrue, NEI.y)
  102. + check_pickle_dump_load(self.assertTrue, NEI.y)
  103. if pyver >= 3.4:
  104. def test_subclasses_with_getnewargs_ex(self):
  105. @@ -1348,9 +1350,9 @@ class TestEnum(unittest.TestCase):
  106. globals()['NEI'] = NEI
  107. NI5 = NamedInt('test', 5)
  108. self.assertEqual(NI5, 5)
  109. - test_pickle_dump_load(self.assertEqual, NI5, 5, protocol=(4, HIGHEST_PROTOCOL))
  110. + check_pickle_dump_load(self.assertEqual, NI5, 5, protocol=(4, HIGHEST_PROTOCOL))
  111. self.assertEqual(NEI.y.value, 2)
  112. - test_pickle_dump_load(self.assertTrue, NEI.y, protocol=(4, HIGHEST_PROTOCOL))
  113. + check_pickle_dump_load(self.assertTrue, NEI.y, protocol=(4, HIGHEST_PROTOCOL))
  114. def test_subclasses_with_reduce(self):
  115. class NamedInt(int):
  116. @@ -1404,9 +1406,9 @@ class TestEnum(unittest.TestCase):
  117. globals()['NEI'] = NEI
  118. NI5 = NamedInt('test', 5)
  119. self.assertEqual(NI5, 5)
  120. - test_pickle_dump_load(self.assertEqual, NI5, 5)
  121. + check_pickle_dump_load(self.assertEqual, NI5, 5)
  122. self.assertEqual(NEI.y.value, 2)
  123. - test_pickle_dump_load(self.assertTrue, NEI.y)
  124. + check_pickle_dump_load(self.assertTrue, NEI.y)
  125. def test_subclasses_with_reduce_ex(self):
  126. class NamedInt(int):
  127. @@ -1460,9 +1462,9 @@ class TestEnum(unittest.TestCase):
  128. globals()['NEI'] = NEI
  129. NI5 = NamedInt('test', 5)
  130. self.assertEqual(NI5, 5)
  131. - test_pickle_dump_load(self.assertEqual, NI5, 5)
  132. + check_pickle_dump_load(self.assertEqual, NI5, 5)
  133. self.assertEqual(NEI.y.value, 2)
  134. - test_pickle_dump_load(self.assertTrue, NEI.y)
  135. + check_pickle_dump_load(self.assertTrue, NEI.y)
  136. def test_subclasses_without_direct_pickle_support(self):
  137. class NamedInt(int):
  138. @@ -1514,8 +1516,8 @@ class TestEnum(unittest.TestCase):
  139. NI5 = NamedInt('test', 5)
  140. self.assertEqual(NI5, 5)
  141. self.assertEqual(NEI.y.value, 2)
  142. - test_pickle_exception(self.assertRaises, TypeError, NEI.x)
  143. - test_pickle_exception(self.assertRaises, PicklingError, NEI)
  144. + check_pickle_exception(self.assertRaises, TypeError, NEI.x)
  145. + check_pickle_exception(self.assertRaises, PicklingError, NEI)
  146. def test_subclasses_without_direct_pickle_support_using_name(self):
  147. class NamedInt(int):
  148. @@ -1569,8 +1571,8 @@ class TestEnum(unittest.TestCase):
  149. NI5 = NamedInt('test', 5)
  150. self.assertEqual(NI5, 5)
  151. self.assertEqual(NEI.y.value, 2)
  152. - test_pickle_dump_load(self.assertTrue, NEI.y)
  153. - test_pickle_dump_load(self.assertTrue, NEI)
  154. + check_pickle_dump_load(self.assertTrue, NEI.y)
  155. + check_pickle_dump_load(self.assertTrue, NEI)
  156. def test_tuple_subclass(self):
  157. class SomeTuple(tuple, Enum):
  158. @@ -1582,7 +1584,7 @@ class TestEnum(unittest.TestCase):
  159. self.assertTrue(isinstance(SomeTuple.second, tuple))
  160. self.assertEqual(SomeTuple.third, (3, 'for the music'))
  161. globals()['SomeTuple'] = SomeTuple
  162. - test_pickle_dump_load(self.assertTrue, SomeTuple.first)
  163. + check_pickle_dump_load(self.assertTrue, SomeTuple.first)
  164. def test_duplicate_values_give_unique_enum_items(self):
  165. class AutoNumber(Enum):
  166. @@ -1832,6 +1834,30 @@ class TestUnique(unittest.TestCase):
  167. self.assertTrue('double -> single' in message)
  168. self.assertTrue('turkey -> triple' in message)
  169. + def test_unique_class(self):
  170. + values = [
  171. + ('switzerland', 1),
  172. + ('sweden', 2),
  173. + ('usa', 3),
  174. + ('iran', 4),
  175. + ('iraq', 4),
  176. + ]
  177. + with self.assertRaises(ValueError):
  178. + enum.Enum('Country', values, allow_synonyms=False)
  179. +
  180. + with self.assertRaises(ValueError):
  181. + class Country(enum.Enum):
  182. + __allow_synonyms__ = False
  183. +
  184. + austria = 1
  185. + australia = 1
  186. +
  187. + with self.assertRaises(ValueError):
  188. + class NoDuplicatesAllowed(enum.Enum):
  189. + __allow_synonyms__ = False
  190. +
  191. + t = NoDuplicatesAllowed('NewEnum', [('russia', 1), ('belorussia', 1)])
  192. +
  193. class TestMe(unittest.TestCase):