01-fix-tests.patch 4.1 KB

12345678910111213141516171819202122232425262728293031323334353637383940414243444546474849505152535455565758596061626364656667686970717273747576777879808182838485868788899091929394959697
  1. --- contrib/python/pyrsistent/py2/tests/checked_map_test.py (index)
  2. +++ contrib/python/pyrsistent/py2/tests/checked_map_test.py (working tree)
  3. @@ -125,10 +125,9 @@ def test_pickling():
  4. class FloatVector(CheckedPVector):
  5. __type__ = float
  6. -
  7. class VectorToSetMap(CheckedPMap):
  8. - __key_type__ = 'checked_map_test.FloatVector'
  9. - __value_type__ = 'checked_map_test.FloatSet'
  10. + __key_type__ = '__tests__.checked_map_test.FloatVector'
  11. + __value_type__ = '__tests__.checked_map_test.FloatSet'
  12. def test_type_check_with_string_specification():
  13. --- contrib/python/pyrsistent/py2/tests/checked_vector_test.py (index)
  14. +++ contrib/python/pyrsistent/py2/tests/checked_vector_test.py (working tree)
  15. @@ -184,7 +184,7 @@ def test_multiple_optional_types():
  16. class NaturalsVectorStr(CheckedPVector):
  17. - __type__ = 'checked_vector_test.Naturals'
  18. + __type__ = '__tests__.checked_vector_test.Naturals'
  19. def test_check_with_string_specification():
  20. --- contrib/python/pyrsistent/py2/tests/class_test.py (index)
  21. +++ contrib/python/pyrsistent/py2/tests/class_test.py (working tree)
  22. @@ -272,8 +272,8 @@ class Numbers(CheckedPVector):
  23. class LinkedList(PClass):
  24. - value = field(type='class_test.Numbers')
  25. - next = field(type=optional('class_test.LinkedList'))
  26. + value = field(type='__tests__.class_test.Numbers')
  27. + next = field(type=optional('__tests__.class_test.LinkedList'))
  28. def test_string_as_type_specifier():
  29. --- contrib/python/pyrsistent/py2/tests/record_test.py (index)
  30. +++ contrib/python/pyrsistent/py2/tests/record_test.py (working tree)
  31. @@ -512,7 +512,7 @@ def test_pset_field_name_string_type():
  32. The created set class name is based on the type of items specified by name
  33. """
  34. class Record(PRecord):
  35. - value = pset_field("record_test.Something")
  36. + value = pset_field("__tests__.record_test.Something")
  37. assert Record().value.__class__.__name__ == "SomethingPSet"
  38. @@ -522,7 +522,7 @@ def test_pset_multiple_string_types_field_name():
  39. items in the set specified by name
  40. """
  41. class Record(PRecord):
  42. - value = pset_field(("record_test.Something", "record_test.Another"))
  43. + value = pset_field(("__tests__.record_test.Something", "__tests__.record_test.Another"))
  44. assert Record().value.__class__.__name__ == "SomethingAnotherPSet"
  45. @@ -649,7 +649,7 @@ def test_pvector_field_name_string_type():
  46. specified by name.
  47. """
  48. class Record(PRecord):
  49. - value = pvector_field("record_test.Something")
  50. + value = pvector_field("__tests__.record_test.Something")
  51. assert Record().value.__class__.__name__ == "SomethingPVector"
  52. def test_pvector_multiple_string_types_field_name():
  53. @@ -658,7 +658,7 @@ def test_pvector_multiple_string_types_field_name():
  54. items in the vector.
  55. """
  56. class Record(PRecord):
  57. - value = pvector_field(("record_test.Something", "record_test.Another"))
  58. + value = pvector_field(("__tests__.record_test.Something", "__tests__.record_test.Another"))
  59. assert Record().value.__class__.__name__ == "SomethingAnotherPVector"
  60. @@ -800,7 +800,7 @@ def test_pmap_field_name_string_type():
  61. specified by name.
  62. """
  63. class Record(PRecord):
  64. - value = pmap_field("record_test.Something", "record_test.Another")
  65. + value = pmap_field("__tests__.record_test.Something", "__tests__.record_test.Another")
  66. assert Record().value.__class__.__name__ == "SomethingToAnotherPMap"
  67. def test_pmap_field_name_multiple_string_types():
  68. @@ -809,8 +809,8 @@ def test_pmap_field_name_multiple_string_types():
  69. including when there are multiple supported types.
  70. """
  71. class Record(PRecord):
  72. - value = pmap_field(("record_test.Something", "record_test.Another"), int)
  73. - value2 = pmap_field(str, ("record_test.Something", "record_test.Another"))
  74. + value = pmap_field(("__tests__.record_test.Something", "__tests__.record_test.Another"), int)
  75. + value2 = pmap_field(str, ("__tests__.record_test.Something", "__tests__.record_test.Another"))
  76. assert ((Record().value.__class__.__name__,
  77. Record().value2.__class__.__name__) ==
  78. ("SomethingAnotherToIntPMap", "StrToSomethingAnotherPMap"))