From: Sarah Hoffmann <lonvia@denofr.de>
Date: Sat, 22 May 2021 08:36:35 +0000 (+0200)
Subject: Merge pull request #2342 from lonvia/icu-tokenizer-ci
X-Git-Tag: v4.0.0~75
X-Git-Url: https://git.openstreetmap.org/nominatim.git/commitdiff_plain/10143e0ac712913d0c33b5df4a4371e7ef849f06?hp=8bf15fa691e286c27c05619ae102fb4db16eda0d

Merge pull request #2342 from lonvia/icu-tokenizer-ci

Add BDD tests with icu tokenizer to CI runs
---

diff --git a/.github/workflows/ci-tests.yml b/.github/workflows/ci-tests.yml
index 3d473751..b60507bc 100644
--- a/.github/workflows/ci-tests.yml
+++ b/.github/workflows/ci-tests.yml
@@ -71,6 +71,11 @@ jobs:
                   vendor/bin/phpcov merge --clover ../../coverage-bdd.xml ./cov
               working-directory: Nominatim/test/bdd
 
+            - name: BDD tests (legacy_icu tokenizer)
+              run: |
+                  behave -DREMOVE_TEMPLATE=1 -DBUILDDIR=$GITHUB_WORKSPACE/build -DTOKENIZER=legacy_icu --format=progress3
+              working-directory: Nominatim/test/bdd
+
             - name: Upload coverage to Codecov
               uses: codecov/codecov-action@v1
               with:
diff --git a/test/bdd/steps/nominatim_environment.py b/test/bdd/steps/nominatim_environment.py
index 0e986f21..1deb43f3 100644
--- a/test/bdd/steps/nominatim_environment.py
+++ b/test/bdd/steps/nominatim_environment.py
@@ -198,8 +198,7 @@ class NominatimEnvironment:
 
                 try:
                     self.run_nominatim('import', '--osm-file', str(self.api_test_file))
-                    if self.tokenizer != 'legacy_icu':
-                        self.run_nominatim('add-data', '--tiger-data', str((testdata / 'tiger').resolve()))
+                    self.run_nominatim('add-data', '--tiger-data', str((testdata / 'tiger').resolve()))
                     self.run_nominatim('freeze')
 
                     if self.tokenizer != 'legacy_icu':