patching expected results refs #21, #11835

eclipse-sumo · Oct 14, 2022 · 0e9a744 · 0e9a744
1 parent b7e648a
commit 0e9a744
Show file tree

Hide file tree

Showing 8 changed files with 23 additions and 6 deletions.
diff --git a/tests/duarouter/trips/rail/long_train/alts.duarouter b/tests/duarouter/trips/rail/long_train/alts.duarouter
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
-<!-- generated on 2022-10-14 13:57:03 by Eclipse SUMO duarouter Version v1_14_1+1747-d0cc110
+<!-- generated on 2022-10-14 18:33:58 by Eclipse SUMO duarouter Version v1_14_1+1753-35551cc
 This data file and the accompanying materials
 are made available under the terms of the Eclipse Public License v2.0
 which accompanies this distribution, and is available at
@@ -35,7 +35,7 @@ SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-or-later
     <vType id="train" length="200.00" vClass="rail"/>
     <vehicle id="t0" type="train" depart="0.00">
         <routeDistribution last="0">
-            <route cost="5.40" probability="1.00000000" edges="c d"/>
+            <route cost="11.22" probability="1.00000000" edges="b2.1 b2.2 c d"/>
         </routeDistribution>
     </vehicle>
 </routes>
diff --git a/tests/duarouter/trips/rail/long_train/errors.duarouter b/tests/duarouter/trips/rail/long_train/errors.duarouter
@@ -1 +0,0 @@
-Warning: Railway routing failure due to turn-around on short edge 'b2.1' for vehicle 't0' time=0.00.

diff --git a/tests/duarouter/trips/rail/long_train/options.duarouter b/tests/duarouter/trips/rail/long_train/options.duarouter
@@ -1,2 +1,3 @@
 --net-file=input_net.net.xml --route-files=input_routes.rou.xml
 -o routes.rou.xml 
+-v
diff --git a/tests/duarouter/trips/rail/long_train/output.duarouter b/tests/duarouter/trips/rail/long_train/output.duarouter
@@ -1 +1,5 @@
+Loading net ... done.
+Skipped until: 0.00
+DijkstraRouter answered 2 queries and explored 9.50 edges on average.
+DijkstraRouter spent 0.00s answering queries (0.00ms on average).
 Success.
diff --git a/tests/duarouter/trips/rail/long_train/routes.duarouter b/tests/duarouter/trips/rail/long_train/routes.duarouter
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
-<!-- generated on 2022-10-14 13:57:03 by Eclipse SUMO duarouter Version v1_14_1+1747-d0cc110
+<!-- generated on 2022-10-14 18:33:58 by Eclipse SUMO duarouter Version v1_14_1+1753-35551cc
 This data file and the accompanying materials
 are made available under the terms of the Eclipse Public License v2.0
 which accompanies this distribution, and is available at
@@ -34,6 +34,6 @@ SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-or-later
 <routes xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://sumo.dlr.de/xsd/routes_file.xsd">
     <vType id="train" length="200.00" vClass="rail"/>
     <vehicle id="t0" type="train" depart="0.00">
-        <route edges="c d"/>
+        <route edges="b2.1 b2.2 c d"/>
     </vehicle>
 </routes>
diff --git a/tests/sumo/rail/rail_signal/siding_deadend/knownbugs.sumo b/tests/sumo/rail/rail_signal/siding_deadend/knownbugs.sumo
@@ -0,0 +1,7 @@
+
+[Reported by erdm_ja at 14Oct19:35:50]
+search_string:Warning: No connection between edge 'gneE2' and edge '-gneE0' found
+search_file:errors
+ignore_other_errors:1
+full_description:routing error
+brief_description:see #6928
diff --git a/tests/sumo/rail/routing/reverse_on_short_start/knownbugs.sumo b/tests/sumo/rail/routing/reverse_on_short_start/knownbugs.sumo
@@ -0,0 +1,7 @@
+
+[Reported by erdm_ja at 14Oct19:36:34]
+search_string:Warning: No connection between edge 'gneE2' and edge '-gneE0' found.
+search_file:errors
+ignore_other_errors:1
+full_description:routing failure
+brief_description:see #6928
diff --git a/tests/sumo/rail/two_passing_loops2/errors.sumo b/tests/sumo/rail/two_passing_loops2/errors.sumo
@@ -1 +0,0 @@
-Warning: Railway routing failure due to turn-around on short edge 'T14_0' for vehicle 'rail3' time=292.00.