patching expected results refs #21, #14815

eclipse-sumo · May 2, 2024 · b1f15a8 · b1f15a8
1 parent 7acfddd
commit b1f15a8
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 19 deletions.
diff --git a/tests/complex/traci/vehicle/insertStop/stop_forbidden_ignore_rerouter_copy/errors.complex b/tests/complex/traci/vehicle/insertStop/stop_forbidden_ignore_rerouter_copy/errors.complex
@@ -1,17 +0,0 @@
-Error: Answered with error to command 0xc4: Stop insertion failed for vehicle 'ego' (Disallowed stop lane 'B2C2_0').
-Traceback (most recent call last):
-  File "/scr1/sumo/tests/../tests/complex/traci/vehicle/insertStop/stop_forbidden_ignore_rerouter_copy/runner.py", line 48, in <module>
-    traci.vehicle.insertStop(vehID, 1, "busStop_B2C2",
-  File "/scr1/sumo/tools/traci/_vehicle.py", line 1096, in insertStop
-    self._setCmd(tc.CMD_INSERT_STOP, vehID, "tsdbdiddib", 9, edgeID, pos,
-  File "/scr1/sumo/tools/traci/domain.py", line 164, in _setCmd
-    self._connection._sendCmd(self._cmdSetID, varID, objectID, format, *values)
-  File "/scr1/sumo/tools/traci/connection.py", line 231, in _sendCmd
-    return self._sendExact()
-  File "/scr1/sumo/tools/traci/connection.py", line 144, in _sendExact
-    raise TraCIException(err, prefix[1], _RESULTS[prefix[2]])
-traci.exceptions.TraCIException: Stop insertion failed for vehicle 'ego' (Disallowed stop lane 'B2C2_0').
-sys:1: ResourceWarning: unclosed <socket.socket fd=3, family=AddressFamily.AF_INET, type=SocketKind.SOCK_STREAM, proto=0, laddr=('127.0.0.1', 59728), raddr=('127.0.0.1', 33355)>
-/usr/lib/python3.10/subprocess.py:1072: ResourceWarning: subprocess 1105305 is still running
-Error: tcpip::Socket::recvAndCheck @ recv: peer shutdown
-Quitting (on error).

diff --git a/tests/complex/traci/vehicle/insertStop/stop_forbidden_ignore_rerouter_copy/vehroutes.complex b/tests/complex/traci/vehicle/insertStop/stop_forbidden_ignore_rerouter_copy/vehroutes.complex
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
-<!-- generated on 2024-05-02 14:13:39 by Eclipse SUMO sumo Version v1_19_0+2039-4ad79ae706e
+<!-- generated on 2024-05-02 14:24:26 by Eclipse SUMO sumo Version v1_19_0+2040-81901051b24
 <configuration xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://sumo.dlr.de/xsd/sumoConfiguration.xsd">
 
     <input>
@@ -26,11 +26,22 @@
     </report>
 
     <traci_server>
-        <remote-port value="33355"/>
+        <remote-port value="41537"/>
     </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="526.00">
+        <routeDistribution>
+            <route replacedOnEdge="A0A1" reason="traci:insertStop" replacedAtTime="5.00" probability="0" edges="A0A1 A1B1 B1C1 C1D1 D1D2 D2D3"/>
+            <route edges="A0A1 A1B1 B1B2 B2C2 C2C1 C1B1 B1C1 C1D1 D1D2 D2D3"/>
+        </routeDistribution>
+        <stop busStop="busStop_A1B1" duration="60.00"/>
+        <stop busStop="busStop_B2C2" duration="30.00"/>
+        <stop busStop="busStop_B1C1" duration="60.00"/>
+        <stop busStop="busStop_C1D1" duration="60.00"/>
+    </vehicle>
+
 </routes>