Merge remote-tracking branch 'upstream/master'

[nominatim.git] / test / bdd / steps / check_functions.py

diff --git a/test/bdd/steps/check_functions.py b/test/bdd/steps/check_functions.py
index 58d6c1f2a481ddf61453df633d90e725ef457036..49676896f4ff4487d5bc3e5ec815a339c3b8043b 100644 (file)
--- a/test/bdd/steps/check_functions.py
+++ b/test/bdd/steps/check_functions.py
@@ -47,15 +47,16 @@ class Field:
     """ Generic comparator for fields, which looks at the type of the
         value compared.
     """
     """ Generic comparator for fields, which looks at the type of the
         value compared.
     """

-    def __init__(self, value):
+    def __init__(self, value, **extra_args):

         self.value = value
         self.value = value

+        self.extra_args = extra_args

 
     def __eq__(self, other):
         if isinstance(self.value, float):
 
     def __eq__(self, other):
         if isinstance(self.value, float):

-            return math.isclose(self.value, float(other))
+            return math.isclose(self.value, float(other), **self.extra_args)

 
         if self.value.startswith('^'):
 
         if self.value.startswith('^'):

-            return re.fullmatch(self.value, other)
+            return re.fullmatch(self.value, str(other))

 
         if isinstance(other, dict):
             return other == eval('{' + self.value + '}')
 
         if isinstance(other, dict):
             return other == eval('{' + self.value + '}')