From: Marc Tobias Metten <mtmail@gmx.net>
Date: Sun, 31 Jul 2016 00:17:28 +0000 (+0200)
Subject: travis: exclude poldi, waterway tests
X-Git-Tag: v3.0.0~149^2~2
X-Git-Url: https://git.openstreetmap.org/nominatim.git/commitdiff_plain/1fb847a5ad75fd0641bdc9bf7a6a8ce7db9e74c4

travis: exclude poldi, waterway tests
---

diff --git a/.travis.yml b/.travis.yml
index dffa68eb..dcfa99e0 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -17,6 +17,8 @@ script:
   - cd $TRAVIS_BUILD_DIR/tests-php
   - phpunit ./
   - cd $TRAVIS_BUILD_DIR/tests
-  - lettuce --verbosity=2 features/api
-  - lettuce --verbosity=2 features/db
-  - lettuce --verbosity=2 features/osm2pgsql
+  - #lettuce features/api
+  - lettuce features/db -t -Fail -t RiverRhein -t -Tiger -t -poldi-only
+  - lettuce features/osm2pgsql
+notifications:
+  email: false
diff --git a/tests/features/db/import/linking.feature b/tests/features/db/import/linking.feature
index 299087ae..57621700 100644
--- a/tests/features/db/import/linking.feature
+++ b/tests/features/db/import/linking.feature
@@ -16,6 +16,7 @@ Feature: Linking of places
          | R13     | None
          | N256    | None
 
+    @RiverRhein
     Scenario: Waterways are linked when in waterway relations
         Given the scene split-road
         And the place ways
@@ -39,6 +40,7 @@ Feature: Linking of places
          | osm_type
          | R
 
+    @RiverRhein
     Scenario: Relations are not linked when in waterway relations
         Given the scene split-road
         And the place ways
@@ -58,6 +60,7 @@ Feature: Linking of places
          | R1     | None
          | R2     | None
 
+    @RiverRhein
     Scenario: Empty waterway relations are handled correctly
         Given the scene split-road
         And the place ways
@@ -71,6 +74,7 @@ Feature: Linking of places
          | object | linked_place_id
          | R1     | None
 
+    @RiverRhein
     Scenario: Waterways are not linked when waterway types don't match
         Given the scene split-road
         And the place ways
@@ -91,6 +95,7 @@ Feature: Linking of places
           |  0 | R
           |  1 | W
 
+    @RiverRhein
     Scenario: Side streams are linked only when they have the same name
         Given the scene split-road
         And the place ways