Skip to content

Commit

Permalink
fixing rerouter test after xml validation, refs #21
Browse files Browse the repository at this point in the history
git-svn-id: file:///home/behr_mi/git/sumo_synched/trunk@15424 afbd958f-9f77-42d5-a016-97a22340ccf4
  • Loading branch information
behrisch committed Jan 17, 2014
1 parent 53c32a3 commit 2946c49
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 6 deletions.
5 changes: 2 additions & 3 deletions sumo/tests/complex/sumo/extended/rerouter/runner.py
Original file line number Diff line number Diff line change
Expand Up @@ -44,11 +44,11 @@ def writeRerouter(edge, t, rerouter, embedded):
fdo = open("rerouter.xml", "w")
fdo.write('<additional xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://sumo.sf.net/xsd/additional_file.xsd">\n\n')
if embedded:
fdo.write('<rerouter id="rerouter" edges="%s" pos="20">\n' % (edge))
fdo.write('<rerouter id="rerouter" edges="%s">\n' % (edge))
writeRerouterDefinition(fdo, edge, t, rerouter)
fdo.write('</rerouter>\n')
else:
fdo.write('<rerouter id="rerouter" edges="%s" pos="20" file="input_definition.def.xml"/>\n' % (edge))
fdo.write('<rerouter id="rerouter" edges="%s" file="input_definition.def.xml"/>\n' % (edge))
fdo.write('</additional>\n')
fdo.close()
if not embedded:
Expand Down Expand Up @@ -134,4 +134,3 @@ def verify(vehroutes, edge):
try: os.remove("vehroutes.xml")
except: pass
nd.close()

8 changes: 5 additions & 3 deletions sumo/tests/complex/sumo/extended/rerouter/sumo.sumocfg
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<configuration xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://sumo.sf.net/xsd/sumoConfiguration.xsd">

<configuration xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://sumo-sim.org/xsd/sumoConfiguration.xsd">

<input>
<net-file value="three_split.net.xml"/>
Expand All @@ -12,8 +13,9 @@
</output>

<report>
<no-step-log value="true" />
<no-duration-log value="true" />
<xml-validation value="never"/>
<no-duration-log value="true"/>
<no-step-log value="true"/>
</report>

</configuration>

0 comments on commit 2946c49

Please sign in to comment.