better cross version compatiblity for protobuf test #21

eclipse-sumo · Jan 19, 2023 · f071b7c · f071b7c
1 parent 4a2efe6
commit f071b7c
Showing 1 changed file with 6 additions and 10 deletions.
diff --git a/tests/complex/sumo/protobuf/runner.py b/tests/complex/sumo/protobuf/runner.py
@@ -23,8 +23,7 @@
 import time
 import socket
 import difflib
-toolDir = os.path.join(
-    os.path.dirname(__file__), '..', '..', '..', '..', "tools")
+toolDir = os.path.join(os.path.dirname(__file__), '..', '..', '..', '..', "tools")
 if 'SUMO_HOME' in os.environ:
     toolDir = os.path.join(os.environ['SUMO_HOME'], "tools")
 sys.path.append(toolDir)
@@ -65,19 +64,16 @@ def connect(inPort, outPort, numTries=10):
 sumoBinary = sumolib.checkBinary('sumo')
 xmlProtoPy = os.path.join(toolDir, 'xml', 'xml2protobuf.py')
 protoXmlPy = os.path.join(toolDir, 'xml', 'protobuf2xml.py')
-schema = os.path.join(
-    toolDir, '..', 'data', 'xsd', 'amitran', 'trajectories.xsd')
+schema = os.path.join(toolDir, '..', 'data', 'xsd', 'amitran', 'trajectories.xsd')
 
 # file output direct
-subprocess.call(
-    [sumoBinary, "-c", "sumo.sumocfg", "--amitran-output", "direct.xml"])
+subprocess.call([sumoBinary, "-c", "sumo.sumocfg", "--amitran-output", "direct.xml"])
 
 # protobuf roundtrip
-xPro = subprocess.Popen(
-    ['python', xmlProtoPy, '-x', schema, '-o', str(IN_PORT), str(SUMO_PORT)])
+os.environ["PROTOCOL_BUFFERS_PYTHON_IMPLEMENTATION"] = "python"
+xPro = subprocess.Popen(['python', xmlProtoPy, '-x', schema, '-o', str(IN_PORT), str(SUMO_PORT)])
 pPro = subprocess.Popen(['python', protoXmlPy, '-x', schema, str(OUT_PORT)])
-sumoPro = subprocess.Popen(
-    [sumoBinary, "-c", "sumo.sumocfg", "--amitran-output", "localhost:%s" % SUMO_PORT])
+sumoPro = subprocess.Popen([sumoBinary, "-c", "sumo.sumocfg", "--amitran-output", "localhost:%s" % SUMO_PORT])
 try:
     connect(IN_PORT, OUT_PORT)
     sumoPro.wait()