Merge remote-tracking branch 'upstream/master'

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

diff --git a/test/bdd/steps/db_ops.py b/test/bdd/steps/db_ops.py
index 377c977d412986de192537928117ff39b86188b0..2b012c41d9be286717b385310780083001cc1602 100644 (file)
--- a/test/bdd/steps/db_ops.py
+++ b/test/bdd/steps/db_ops.py
@@ -487,8 +487,8 @@ def check_search_name_contents(context, exclude):
                                    """,
                                    (terms, words))
                     if not exclude:
                                    """,
                                    (terms, words))
                     if not exclude:

-                        ok_(subcur.rowcount >= len(terms),
-                            "No word entry found for " + row[h])
+                        ok_(subcur.rowcount >= len(terms) + len(words),
+                            "No word entry found for " + row[h] + ". Entries found: " + str(subcur.rowcount))

                     for wid in subcur:
                         if exclude:
                             assert_not_in(wid[0], res[h],
                     for wid in subcur:
                         if exclude:
                             assert_not_in(wid[0], res[h],