also enable flake for tests in github actions

[nominatim.git] / test / python / tools / test_postcodes.py

diff --git a/test/python/tools/test_postcodes.py b/test/python/tools/test_postcodes.py
index f5e8f3de0c83c329fce8e2d83a4ecbea0a84ed33..b03c9748441a69537859b404dc125db55411ff18 100644 (file)
--- a/test/python/tools/test_postcodes.py
+++ b/test/python/tools/test_postcodes.py
@@ -1,8 +1,8 @@
-# SPDX-License-Identifier: GPL-2.0-only
+# SPDX-License-Identifier: GPL-3.0-or-later

 #
 # This file is part of Nominatim. (https://nominatim.org)
 #
 #
 # This file is part of Nominatim. (https://nominatim.org)
 #

-# Copyright (C) 2022 by the Nominatim developer community.
+# Copyright (C) 2025 by the Nominatim developer community.

 # For a full list of authors see the git log.
 """
 Tests for functions to maintain the artificial postcode table.
 # For a full list of authors see the git log.
 """
 Tests for functions to maintain the artificial postcode table.


@@ -11,10 +11,11 @@ import subprocess
 
 import pytest
 
 
 import pytest
 

-from nominatim.tools import postcodes
-from nominatim.data import country_info
+from nominatim_db.tools import postcodes
+from nominatim_db.data import country_info

 import dummy_tokenizer
 
 import dummy_tokenizer
 

+

 class MockPostcodeTable:
     """ A location_postcode table for testing.
     """
 class MockPostcodeTable:
     """ A location_postcode table for testing.
     """


@@ -35,7 +36,7 @@ class MockPostcodeTable:
                            RETURNS TEXT AS $$ BEGIN RETURN postcode; END; $$ LANGUAGE plpgsql;
 
                            CREATE OR REPLACE FUNCTION get_country_code(place geometry)
                            RETURNS TEXT AS $$ BEGIN RETURN postcode; END; $$ LANGUAGE plpgsql;
 
                            CREATE OR REPLACE FUNCTION get_country_code(place geometry)

-                           RETURNS TEXT AS $$ BEGIN 
+                           RETURNS TEXT AS $$ BEGIN

                            RETURN null;
                            END; $$ LANGUAGE plpgsql;
                         """)
                            RETURN null;
                            END; $$ LANGUAGE plpgsql;
                         """)


@@ -47,11 +48,10 @@ class MockPostcodeTable:
                                                           country_code, postcode,
                                                           geometry)
                            VALUES (nextval('seq_place'), 1, %s, %s,
                                                           country_code, postcode,
                                                           geometry)
                            VALUES (nextval('seq_place'), 1, %s, %s,

-                                   'SRID=4326;POINT(%s %s)')""",
+                                   ST_SetSRID(ST_MakePoint(%s, %s), 4326))""",

                         (country, postcode, x, y))
         self.conn.commit()
 
                         (country, postcode, x, y))
         self.conn.commit()
 

-

     @property
     def row_set(self):
         with self.conn.cursor() as cur:
     @property
     def row_set(self):
         with self.conn.cursor() as cur:


@@ -180,7 +180,7 @@ def test_postcodes_extern(dsn, postcode_table, tmp_path,
                                       ('xx', 'CD 4511', -10, -5)}
 
 
                                       ('xx', 'CD 4511', -10, -5)}
 
 

-def test_postcodes_extern_bad_column(dsn, postcode_table, tmp_path, 
+def test_postcodes_extern_bad_column(dsn, postcode_table, tmp_path,

                                      insert_implicit_postcode, tokenizer):
     insert_implicit_postcode(1, 'xx', 'POINT(10 12)', dict(postcode='AB 4511'))
 
                                      insert_implicit_postcode, tokenizer):
     insert_implicit_postcode(1, 'xx', 'POINT(10 12)', dict(postcode='AB 4511'))
 


@@ -204,6 +204,7 @@ def test_postcodes_extern_bad_number(dsn, insert_implicit_postcode,
     assert postcode_table.row_set == {('xx', 'AB 4511', 10, 12),
                                       ('xx', 'CD 4511', -10, -5)}
 
     assert postcode_table.row_set == {('xx', 'AB 4511', 10, 12),
                                       ('xx', 'CD 4511', -10, -5)}
 

+

 def test_can_compute(dsn, table_factory):
     assert not postcodes.can_compute(dsn)
     table_factory('place')
 def test_can_compute(dsn, table_factory):
     assert not postcodes.can_compute(dsn)
     table_factory('place')


@@ -211,10 +212,10 @@ def test_can_compute(dsn, table_factory):
 
 
 def test_no_placex_entry(dsn, tmp_path, temp_db_cursor, place_row, postcode_table, tokenizer):
 
 
 def test_no_placex_entry(dsn, tmp_path, temp_db_cursor, place_row, postcode_table, tokenizer):

-    #Rewrite the get_country_code function to verify its execution.
+    # Rewrite the get_country_code function to verify its execution.

     temp_db_cursor.execute("""
         CREATE OR REPLACE FUNCTION get_country_code(place geometry)
     temp_db_cursor.execute("""
         CREATE OR REPLACE FUNCTION get_country_code(place geometry)

-        RETURNS TEXT AS $$ BEGIN 
+        RETURNS TEXT AS $$ BEGIN

         RETURN 'yy';
         END; $$ LANGUAGE plpgsql;
     """)
         RETURN 'yy';
         END; $$ LANGUAGE plpgsql;
     """)


@@ -224,11 +225,12 @@ def test_no_placex_entry(dsn, tmp_path, temp_db_cursor, place_row, postcode_tabl
     assert postcode_table.row_set == {('yy', 'AB 4511', 10, 12)}
 
 
     assert postcode_table.row_set == {('yy', 'AB 4511', 10, 12)}
 
 

-def test_discard_badly_formatted_postcodes(dsn, tmp_path, temp_db_cursor, place_row, postcode_table, tokenizer):
-    #Rewrite the get_country_code function to verify its execution.
+def test_discard_badly_formatted_postcodes(dsn, tmp_path, temp_db_cursor, place_row,
+                                           postcode_table, tokenizer):
+    # Rewrite the get_country_code function to verify its execution.

     temp_db_cursor.execute("""
         CREATE OR REPLACE FUNCTION get_country_code(place geometry)
     temp_db_cursor.execute("""
         CREATE OR REPLACE FUNCTION get_country_code(place geometry)

-        RETURNS TEXT AS $$ BEGIN 
+        RETURNS TEXT AS $$ BEGIN

         RETURN 'fr';
         END; $$ LANGUAGE plpgsql;
     """)
         RETURN 'fr';
         END; $$ LANGUAGE plpgsql;
     """)