Revert #2795: Rewrite cucumber test caching, Tests Failing At Random

This reverts commit 7d124ce.
Project-OSRM · Sep 20, 2016 · e1a5d8a · e1a5d8a
1 parent 7d124ce
commit e1a5d8a
Show file tree

Hide file tree

Showing 60 changed files with 1,136 additions and 863 deletions.
diff --git a/cucumber.js b/cucumber.js
@@ -1,8 +1,10 @@
 module.exports = {
-    default: '--strict --tags ~@stress --tags ~@todo --require features/support --require features/step_definitions',
-    verify: '--strict --tags ~@stress --tags ~@todo -f progress --require features/support --require features/step_definitions',
-    todo: '--strict --tags @todo --require features/support --require features/step_definitions',
-    all: '--strict --require features/support --require features/step_definitions'
+    default: '--require features --tags ~@stress --tags ~@todo',
+    verify: '--require features --tags ~@todo --tags ~@bug --tags ~@stress -f progress',
+    jenkins: '--require features --tags ~@todo --tags ~@bug --tags ~@stress --tags ~@options -f progress',
+    bugs: '--require features --tags @bug',
+    todo: '--require features --tags @todo',
+    all: '--require features'
 }
 
 

diff --git a/features/car/traffic_speeds.feature b/features/car/traffic_speeds.feature
@@ -25,7 +25,7 @@ Feature: Traffic - speeds
             | fb    | primary |
         Given the profile "testbot"
         Given the extract extra arguments "--generate-edge-lookup"
-        Given the contract extra arguments "--segment-speed-file {speeds_file}"
+        Given the contract extra arguments "--segment-speed-file speeds.csv"
         Given the speed file
         """
         1,2,0
@@ -69,7 +69,7 @@ Feature: Traffic - speeds
             | fb    | primary |
         Given the profile "testbot"
         Given the extract extra arguments "--generate-edge-lookup"
-        Given the contract extra arguments "--segment-speed-file {speeds_file}"
+        Given the contract extra arguments "--segment-speed-file speeds.csv"
         Given the speed file
         """
         1,2,0
@@ -112,6 +112,7 @@ Feature: Traffic - speeds
             | fb    | primary |
         Given the profile "testbot"
         Given the extract extra arguments "--generate-edge-lookup"
+        Given the contract extra arguments "--segment-speed-file speeds.csv"
         Given the speed file
         """
         1,2,-10
@@ -122,6 +123,6 @@ Feature: Traffic - speeds
         4,1,-5
         """
         And the data has been extracted
-        When I try to run "osrm-contract --segment-speed-file {speeds_file} {processed_file}"
+        When I run "osrm-contract --segment-speed-file speeds.csv {extracted_base}.osrm"
         And stderr should contain "malformed"
-        And it should exit with an error
+        And it should exit with code not 0
diff --git a/features/car/traffic_turn_penalties.feature b/features/car/traffic_turn_penalties.feature
@@ -58,7 +58,7 @@ Feature: Traffic - turn penalties
             8,11,12,23
             1,4,5,-0.2
             """
-        And the contract extra arguments "--turn-penalty-file {penalties_file}"
+        And the contract extra arguments "--turn-penalty-file penalties.csv"
         When I route I should get
             | from | to | route                 | speed   | time      |
             | a    | h  | ad,dhk,dhk            | 63 km/h | 11.5s +-1 |
@@ -81,7 +81,7 @@ Feature: Traffic - turn penalties
                                                                               # double left - hdc penalty ever so slightly higher than imn; forces all the way around
 
     Scenario: Too-negative penalty clamps, but does not fail
-        Given the contract extra arguments "--turn-penalty-file {penalties_file}"
+        Given the contract extra arguments "--turn-penalty-file penalties.csv"
         And the profile "testbot"
         And the turn penalty file
             """

diff --git a/features/guidance/anticipate-lanes.feature b/features/guidance/anticipate-lanes.feature
@@ -422,7 +422,7 @@ Feature: Turn Lane Guidance
                | waypoints | route               | turns                                          | lanes                                                                                                                                                             |
                | a,e       | main,main,main,main | depart,use lane straight,continue right,arrive | ,left:false straight:false straight:false straight:false straight:true straight:true right:false,straight:false straight:false right:false right:true right:true, |
 
-    @anticipate @todo @2661
+    @anticipate @todo @bug @2661
     Scenario: Anticipate with lanes in roundabout: roundabouts as the unit of anticipation
         Given the node map
             |   |   | e |   |   |
@@ -667,7 +667,7 @@ Feature: Turn Lane Guidance
             | a,f       | abc,bdeh,feg,feg | depart,turn right,turn right,arrive | ,none:false none:false right:false right:true,left:false none:false none:false right:true, |
 
     @anticipate
-    Scenario: Triple Right keeping Left
+    Scenario: Tripple Right keeping Left
         Given the node map
             | a |   |   |   | b |   | i |
             |   |   |   |   |   |   |   |

diff --git a/features/guidance/turn-lanes.feature b/features/guidance/turn-lanes.feature
@@ -620,7 +620,7 @@ Feature: Turn Lane Guidance
             | a,d       | hwy,hwy       | depart,arrive                       | ,                                                                            |
             | a,e       | hwy,ramp,ramp | depart,off ramp slight right,arrive | ,straight:false straight:false straight;slight right:true slight right:true, |
 
-    @todo
+    @bug @todo
     Scenario: Turning Off Ramp
         Given the node map
             |   | a |   |

diff --git a/features/lib/hash.js b/features/lib/hash.js
diff --git a/features/lib/osrm_loader.js b/features/lib/osrm_loader.js
diff --git a/features/lib/table_diff.js b/features/lib/table_diff.js
diff --git a/features/lib/try_connect.js b/features/lib/try_connect.js
diff --git a/features/lib/utils.js b/features/lib/utils.js