Update regexes in tests to work with Python 2.7

This commit is contained in:
Jonathan Reichelt Gjertsen 2019-09-08 17:33:30 +02:00 committed by Ram Rachum
parent 8d7d21d0d8
commit d6330dc6a6
1 changed files with 12 additions and 12 deletions

View File

@ -1259,12 +1259,12 @@ def test_class():
output, output,
( (
SourcePathEntry(), SourcePathEntry(),
VariableEntry('self', value_regex="u?.+<locals>.MyClass object at"), VariableEntry('self', value_regex="u?.+MyClass object at"),
CallEntry('def __init__(self):'), CallEntry('def __init__(self):'),
LineEntry('self.x = 7'), LineEntry('self.x = 7'),
ReturnEntry('self.x = 7'), ReturnEntry('self.x = 7'),
ReturnValueEntry('None'), ReturnValueEntry('None'),
VariableEntry('self', value_regex="u?.+<locals>.MyClass object at"), VariableEntry('self', value_regex="u?.+MyClass object at"),
VariableEntry('foo', value_regex="u?'baba'"), VariableEntry('foo', value_regex="u?'baba'"),
CallEntry('def my_method(self, foo):'), CallEntry('def my_method(self, foo):'),
LineEntry('y = 8'), LineEntry('y = 8'),
@ -1302,14 +1302,14 @@ def test_class_with_decorated_method():
output, output,
( (
SourcePathEntry(), SourcePathEntry(),
VariableEntry('self', value_regex="u?.+<locals>.MyClass object at"), VariableEntry('self', value_regex="u?.+MyClass object at"),
CallEntry('def __init__(self):'), CallEntry('def __init__(self):'),
LineEntry('self.x = 7'), LineEntry('self.x = 7'),
ReturnEntry('self.x = 7'), ReturnEntry('self.x = 7'),
ReturnValueEntry('None'), ReturnValueEntry('None'),
VariableEntry('args', value_regex=r"\(<.+>, 'baba'\)"), VariableEntry('args', value_regex=r"\(<.+>, 'baba'\)"),
VariableEntry('kwargs', value_regex=r"\{\}"), VariableEntry('kwargs', value_regex=r"\{\}"),
VariableEntry('function', value_regex="u?.+<locals>.MyClass.my_method at"), VariableEntry('function', value_regex="u?.+my_method at"),
CallEntry('def wrapper(*args, **kwargs):'), CallEntry('def wrapper(*args, **kwargs):'),
LineEntry('result = function(*args, **kwargs)'), LineEntry('result = function(*args, **kwargs)'),
VariableEntry('result', '15'), VariableEntry('result', '15'),
@ -1348,18 +1348,18 @@ def test_class_with_decorated_method_and_snoop_applied_to_method():
output, output,
( (
SourcePathEntry(), SourcePathEntry(),
VariableEntry('self', value_regex="u?.*<locals>.MyClass object at"), VariableEntry('self', value_regex="u?.*MyClass object at"),
CallEntry('def __init__(self):'), CallEntry('def __init__(self):'),
LineEntry('self.x = 7'), LineEntry('self.x = 7'),
ReturnEntry('self.x = 7'), ReturnEntry('self.x = 7'),
ReturnValueEntry('None'), ReturnValueEntry('None'),
VariableEntry('args', value_regex=r"u?\(<.+>, 'baba'\)"), VariableEntry('args', value_regex=r"u?\(<.+>, 'baba'\)"),
VariableEntry('kwargs', value_regex=r"u?\{\}"), VariableEntry('kwargs', value_regex=r"u?\{\}"),
VariableEntry('function', value_regex="u?.*<locals>.MyClass.my_method at"), VariableEntry('function', value_regex="u?.*my_method at"),
CallEntry('def wrapper(*args, **kwargs):'), CallEntry('def wrapper(*args, **kwargs):'),
LineEntry('result = function(*args, **kwargs)'), LineEntry('result = function(*args, **kwargs)'),
SourcePathEntry(), SourcePathEntry(),
VariableEntry('self', value_regex="u?.*<locals>.MyClass object at"), VariableEntry('self', value_regex="u?.*MyClass object at"),
VariableEntry('foo', value_regex="u?'baba'"), VariableEntry('foo', value_regex="u?'baba'"),
CallEntry('def my_method(self, foo):'), CallEntry('def my_method(self, foo):'),
LineEntry('y = 8'), LineEntry('y = 8'),
@ -1420,28 +1420,28 @@ def test_class_with_property():
output, output,
( (
SourcePathEntry(), SourcePathEntry(),
VariableEntry('self', value_regex="u?.*<locals>.MyClass object at"), VariableEntry('self', value_regex="u?.*MyClass object at"),
CallEntry('def __init__(self):'), CallEntry('def __init__(self):'),
LineEntry('self._x = 0'), LineEntry('self._x = 0'),
ReturnEntry('self._x = 0'), ReturnEntry('self._x = 0'),
ReturnValueEntry('None'), ReturnValueEntry('None'),
# Called from getter # Called from getter
VariableEntry('self', value_regex="u?.*<locals>.MyClass object at"), VariableEntry('self', value_regex="u?.*MyClass object at"),
CallEntry('def plain_method(self):'), CallEntry('def plain_method(self):'),
LineEntry('pass'), LineEntry('pass'),
ReturnEntry('pass'), ReturnEntry('pass'),
ReturnValueEntry('None'), ReturnValueEntry('None'),
# Called from setter # Called from setter
VariableEntry('self', value_regex="u?.*<locals>.MyClass object at"), VariableEntry('self', value_regex="u?.*MyClass object at"),
CallEntry('def plain_method(self):'), CallEntry('def plain_method(self):'),
LineEntry('pass'), LineEntry('pass'),
ReturnEntry('pass'), ReturnEntry('pass'),
ReturnValueEntry('None'), ReturnValueEntry('None'),
# Called from deleter # Called from deleter
VariableEntry('self', value_regex="u?.*<locals>.MyClass object at"), VariableEntry('self', value_regex="u?.*MyClass object at"),
CallEntry('def plain_method(self):'), CallEntry('def plain_method(self):'),
LineEntry('pass'), LineEntry('pass'),
ReturnEntry('pass'), ReturnEntry('pass'),
@ -1476,7 +1476,7 @@ def test_snooping_on_class_does_not_cause_base_class_to_be_snooped():
output, output,
( (
SourcePathEntry(), SourcePathEntry(),
VariableEntry('self', value_regex="u?.*<locals>.MyClass object at"), VariableEntry('self', value_regex="u?.*MyClass object at"),
CallEntry('def method_on_child_class(self):'), CallEntry('def method_on_child_class(self):'),
LineEntry('self.method_on_base_class()'), LineEntry('self.method_on_base_class()'),
ReturnEntry('self.method_on_base_class()'), ReturnEntry('self.method_on_base_class()'),