Merge remote-tracking branch 'upstream/master'

[nominatim.git] / tests / steps / api_result.py

diff --git a/tests/steps/api_result.py b/tests/steps/api_result.py
index 369127d861d6e0e1b79b777008a57a45fcca9982..17d5e4eb09098c404461f8076df1ba75d396e704 100644 (file)
--- a/tests/steps/api_result.py
+++ b/tests/steps/api_result.py
@@ -27,7 +27,7 @@ def _parse_xml():
     world.results = []
 
     # results
-    if page.nodeName == 'searchresults':
+    if page.nodeName == 'searchresults' or page.nodeName == 'lookupresults':
         for node in page.childNodes:
             if node.nodeName != "#text":
                 assert_equals(node.nodeName, 'place', msg="Unexpected element '%s'" % node.nodeName)
@@ -199,7 +199,10 @@ def api_result_address_exact(step, resid):
     addr = world.results[resid]['address']
     for line in step.hashes:
         assert_in(line['type'], addr)
-        assert_equals(line['value'], addr[line['type']])
+        m = re.match("%s$" % line['value'], addr[line['type']])
+        assert_is_not_none(m, msg="field %s does not match: %s$ != %s." % (
+                                  line['type'], line['value'], addr[line['type']]))
+        #assert_equals(line['value'], addr[line['type']])
 
 @step(u'address of result (\d+) does not contain (.*)')
 def api_result_address_details_missing(step, resid, types):