patching expected results refs #21, #14438

eclipse-sumo · Feb 29, 2024 · b2c9e4d · b2c9e4d
1 parent 354b9d4
commit b2c9e4d
Show file tree

Hide file tree

Showing 10 changed files with 21 additions and 26 deletions.
diff --git a/tests/complex/traci/vehicle/replaceStop/first_teleport_custom_duration/runner.py b/tests/complex/traci/vehicle/replaceStop/first_teleport_custom_duration/runner.py
@@ -43,7 +43,7 @@
 
 while traci.simulation.getMinExpectedNumber() > 0:
     if traci.simulation.getTime() == 5:
-        traci.vehicle.insertStop(vehID, 0, "A0A1", 50)
+        traci.vehicle.insertStop(vehID, 0, "A0A1", 50, duration=-1)
         traci.vehicle.setStopParameter(vehID, 0, "speed", "1000")
         traci.vehicle.setStopParameter(vehID, 0, "jump", "30")
         traci.vehicle.replaceStop(vehID, 1, "busStop_A2B2", flags=tc.STOP_BUS_STOP,

diff --git a/tests/complex/traci/vehicle/replaceStop/first_teleport_custom_duration/vehroutes.complex b/tests/complex/traci/vehicle/replaceStop/first_teleport_custom_duration/vehroutes.complex
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
-<!-- generated on 2024-02-29 16:44:57 by Eclipse SUMO sumo Version v1_19_0+1097-b485b475aa1
+<!-- generated on 2024-02-29 16:50:24 by Eclipse SUMO sumo Version v1_19_0+1099-88e3be13895
 <configuration xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://sumo.dlr.de/xsd/sumoConfiguration.xsd">
 
     <input>
@@ -18,7 +18,7 @@
     </report>
 
     <traci_server>
-        <remote-port value="51833"/>
+        <remote-port value="38701"/>
     </traci_server>
 
 </configuration>
@@ -31,8 +31,7 @@
             <route replacedOnEdge="A0A1" reason="traci:replaceStop" replacedAtTime="5.00" probability="0" edges="A0A1 A1B1 B1C1 C1D1 D1D2 D2D3"/>
             <route edges="A0A1 A2B2 B2B1 B1C1 C1D1 D1D2 D2D3"/>
         </routeDistribution>
-        <stop lane="A0A1_0" startPos="49.90" endPos="50.00" duration="92233720368547758.07" speed="1000.00" jump="30.00"/>
-        <stop edge="A0A1" speed="1000.00" jump="0.00"/>
+        <stop lane="A0A1_0" startPos="49.90" endPos="50.00" speed="1000.00" jump="30.00"/>
         <stop busStop="busStop_A2B2" duration="30.00"/>
         <stop busStop="busStop_B1C1" duration="60.00"/>
         <stop busStop="busStop_C1D1" duration="60.00"/>

diff --git a/tests/complex/traci/vehicle/replaceStop/last_same_location_teleport/errors.complex b/tests/complex/traci/vehicle/replaceStop/last_same_location_teleport/errors.complex
@@ -1,2 +0,0 @@
-Warning: Teleporting vehicle 'ego'; waited too long (wrong lane, disconnected), lane='A1B1_0', time=85.00.
-Warning: Vehicle 'ego' ends teleporting on edge 'C1D1', time=85.00.

diff --git a/tests/complex/traci/vehicle/replaceStop/last_same_location_teleport/vehroutes.complex b/tests/complex/traci/vehicle/replaceStop/last_same_location_teleport/vehroutes.complex
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
-<!-- generated on 2022-02-02 12:20:28 by Eclipse SUMO sumo Version v1_12_0+0212-f27fcdc
+<!-- generated on 2024-02-29 16:50:24 by Eclipse SUMO sumo Version v1_19_0+1099-88e3be13895
 <configuration xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://sumo.dlr.de/xsd/sumoConfiguration.xsd">
 
     <input>
@@ -22,19 +22,20 @@
     </report>
 
     <traci_server>
-        <remote-port value="38242"/>
+        <remote-port value="42611"/>
     </traci_server>
 
 </configuration>
 -->
 
 <routes xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://sumo.dlr.de/xsd/routes_file.xsd">
-    <vehicle id="ego" depart="0.00" arrival="143.00">
+    <vehicle id="ego" depart="0.00" arrival="142.00">
         <routeDistribution>
             <route replacedOnEdge="A1B1" replacedOnIndex="1" reason="traci:replaceStop" replacedAtTime="16.00" probability="0" edges="A0A1 A1B1 B1C1 C1D1 D1D2 D2D3"/>
             <route edges="A0A1 A1B1 C1D1 D1D2 D2D3"/>
         </routeDistribution>
         <stop busStop="busStop_A1B1" duration="60.00"/>
+        <stop edge="A1B1" speed="1000.00" jump="0.00"/>
         <stop busStop="busStop_C1D1" duration="30.00"/>
     </vehicle>
 

diff --git a/tests/complex/traci/vehicle/replaceStop/second_teleport/errors.complex b/tests/complex/traci/vehicle/replaceStop/second_teleport/errors.complex
@@ -1,2 +0,0 @@
-Warning: Teleporting vehicle 'ego'; waited too long (wrong lane, disconnected), lane='A1B1_0', time=85.00.
-Warning: Vehicle 'ego' ends teleporting on edge 'B2C2', time=85.00.

diff --git a/tests/complex/traci/vehicle/replaceStop/second_teleport/vehroutes.complex b/tests/complex/traci/vehicle/replaceStop/second_teleport/vehroutes.complex
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
-<!-- generated on Wed Mar 17 11:00:03 2021 by Eclipse SUMO sumo Version v1_8_0+1681-91e011f
+<!-- generated on 2024-02-29 16:50:24 by Eclipse SUMO sumo Version v1_19_0+1099-88e3be13895
 <configuration xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://sumo.dlr.de/xsd/sumoConfiguration.xsd">
 
     <input>
@@ -22,19 +22,20 @@
     </report>
 
     <traci_server>
-        <remote-port value="43161"/>
+        <remote-port value="48703"/>
     </traci_server>
 
 </configuration>
 -->
 
 <routes xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://sumo.dlr.de/xsd/routes_file.xsd">
-    <vehicle id="ego" depart="0.00" arrival="224.00">
+    <vehicle id="ego" depart="0.00" arrival="223.00">
         <routeDistribution>
             <route replacedOnEdge="A0A1" reason="traci:replaceStop" replacedAtTime="5.00" probability="0" edges="A0A1 A1B1 B1C1 C1D1 D1D2 D2D3"/>
             <route edges="A0A1 A1B1 B2C2 C2C1 C1D1 D1D2 D2D3"/>
         </routeDistribution>
         <stop busStop="busStop_A1B1" duration="60.00"/>
+        <stop edge="A1B1" speed="1000.00" jump="0.00"/>
         <stop busStop="busStop_B2C2" duration="30.00"/>
         <stop busStop="busStop_C1D1" duration="60.00"/>
     </vehicle>

diff --git a/tests/complex/traci/vehicle/replaceStop/second_teleport_oncoming/errors.complex b/tests/complex/traci/vehicle/replaceStop/second_teleport_oncoming/errors.complex
@@ -1,3 +1 @@
 Warning: Invalid approach information to rail signal 'junction 'B1', link 5' after rerouting for vehicle 'ego' first driveway edge 'B1C1' time=5.00.
-Warning: Teleporting vehicle 'ego'; waited too long (wrong lane, disconnected), lane='A1B1_0', time=118.00.
-Warning: Vehicle 'ego' ends teleporting on edge 'B2C2', time=118.00.
diff --git a/tests/complex/traci/vehicle/replaceStop/second_teleport_oncoming/vehroutes.complex b/tests/complex/traci/vehicle/replaceStop/second_teleport_oncoming/vehroutes.complex
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
-<!-- generated on 2022-08-26 20:02:34 by Eclipse SUMO sumo Version v1_14_1+0588-051711c
+<!-- generated on 2024-02-29 16:50:24 by Eclipse SUMO sumo Version v1_19_0+1099-88e3be13895
 <configuration xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://sumo.dlr.de/xsd/sumoConfiguration.xsd">
 
     <input>
@@ -22,7 +22,7 @@
     </report>
 
     <traci_server>
-        <remote-port value="43990"/>
+        <remote-port value="52411"/>
     </traci_server>
 
 </configuration>
@@ -33,13 +33,14 @@
         <route edges="D2C2 C2C3"/>
     </vehicle>
 
-    <vehicle id="ego" type="train" depart="0.00" arrival="350.00">
+    <vehicle id="ego" type="train" depart="0.00" arrival="349.00">
         <routeDistribution>
             <route replacedOnEdge="A0A1" reason="traci:replaceStop" replacedAtTime="5.00" probability="0" edges="A0A1 A1B1 B1C1 C1D1 D1D2 D2D3"/>
-            <route replacedOnEdge="B2C2" replacedOnIndex="2" reason="railSignal:C2_4" replacedAtTime="119.00" probability="0" edges="A0A1 A1B1 B2C2 C2D2 D2D1 D1C1 C1D1 D1D2 D2D3"/>
+            <route replacedOnEdge="B2C2" replacedOnIndex="2" reason="railSignal:C2_4" replacedAtTime="118.00" probability="0" edges="A0A1 A1B1 B2C2 C2D2 D2D1 D1C1 C1D1 D1D2 D2D3"/>
             <route edges="A0A1 A1B1 B2C2 C2C3 C3D3 D3D2 D2D1 D1D0 D0C0 C0C1 C1D1 D1D2 D2D3"/>
         </routeDistribution>
         <stop busStop="busStop_A1B1" duration="60.00"/>
+        <stop edge="A1B1" speed="1000.00" jump="0.00"/>
         <stop busStop="busStop_B2C2" duration="30.00"/>
         <stop busStop="busStop_C1D1" duration="60.00"/>
     </vehicle>

diff --git a/tests/complex/traci/vehicle/replaceStop/second_unreachable_teleport/errors.complex b/tests/complex/traci/vehicle/replaceStop/second_unreachable_teleport/errors.complex
@@ -1,2 +0,0 @@
-Warning: Teleporting vehicle 'ego'; waited too long (wrong lane, disconnected), lane='A1B1_0', time=87.00.
-Warning: Vehicle 'ego' ends teleporting on edge 'B2C2', time=87.00.

diff --git a/tests/complex/traci/vehicle/replaceStop/second_unreachable_teleport/vehroutes.complex b/tests/complex/traci/vehicle/replaceStop/second_unreachable_teleport/vehroutes.complex
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
-<!-- generated on Wed Mar 17 12:16:57 2021 by Eclipse SUMO sumo Version v1_8_0+1684-c3c72bd
+<!-- generated on 2024-02-29 16:50:24 by Eclipse SUMO sumo Version v1_19_0+1099-88e3be13895
 <configuration xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://sumo.dlr.de/xsd/sumoConfiguration.xsd">
 
     <input>
@@ -22,19 +22,20 @@
     </report>
 
     <traci_server>
-        <remote-port value="50169"/>
+        <remote-port value="45771"/>
     </traci_server>
 
 </configuration>
 -->
 
 <routes xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://sumo.dlr.de/xsd/routes_file.xsd">
-    <vehicle id="ego" depart="0.00" arrival="227.00">
+    <vehicle id="ego" depart="0.00" arrival="226.00">
         <routeDistribution>
             <route replacedOnEdge="A0A1" reason="traci:replaceStop" replacedAtTime="5.00" probability="0" edges="A0A1 A1B1 B1C1 C1D1 D1D2 D2D3"/>
             <route edges="A0A1 A1B1 B2C2 C2C1 C1D1 D1D2 D2D3"/>
         </routeDistribution>
         <stop busStop="busStop_A1B1" duration="60.00"/>
+        <stop edge="A1B1" speed="1000.00" jump="0.00"/>
         <stop busStop="busStop_B2C2" duration="30.00"/>
         <stop busStop="busStop_C1D1" duration="60.00"/>
     </vehicle>