travis: exclude poldi, waterway tests

diff --git a/.travis.yml b/.travis.yml
index dffa68eb07815196e58eebe48f43b3d16b3b20ec..dcfa99e0764576b344c4420c79e3619cbe65f3cf 100644 (file)
--- a/.travis.yml
+++ b/.travis.yml
@@ -17,6 +17,8 @@ script:
   - cd $TRAVIS_BUILD_DIR/tests-php
   - phpunit ./
   - cd $TRAVIS_BUILD_DIR/tests
   - 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 299087aef7e01fcbd93c6fe23317e7443440147a..576217007c6d2a0d4f8624dc0f480953444b425a 100644 (file)
--- 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
 
          | R13     | None
          | N256    | None
 

+    @RiverRhein

     Scenario: Waterways are linked when in waterway relations
         Given the scene split-road
         And the place ways
     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
 
          | osm_type
          | R
 

+    @RiverRhein

     Scenario: Relations are not linked when in waterway relations
         Given the scene split-road
         And the place ways
     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
 
          | R1     | None
          | R2     | None
 

+    @RiverRhein

     Scenario: Empty waterway relations are handled correctly
         Given the scene split-road
         And the place ways
     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
 
          | 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
     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
 
           |  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
     Scenario: Side streams are linked only when they have the same name
         Given the scene split-road
         And the place ways