summaryrefslogtreecommitdiff
path: root/python/test
diff options
context:
space:
mode:
authorMark Spruiell <mes@zeroc.com>2015-08-27 23:18:12 +0000
committerMark Spruiell <mes@zeroc.com>2015-08-27 23:18:12 +0000
commit60183a95b4ac37b203e915c6221a55575b291a29 (patch)
tree1932787a25e601cd1be87a02251311449cb9bb89 /python/test
parentDisable stacktraces for Linux ARM (diff)
downloadice-60183a95b4ac37b203e915c6221a55575b291a29.tar.bz2
ice-60183a95b4ac37b203e915c6221a55575b291a29.tar.xz
ice-60183a95b4ac37b203e915c6221a55575b291a29.zip
ICE-6742 - python3 failure in test/Ice/properties
Diffstat (limited to 'python/test')
-rwxr-xr-xpython/test/Ice/properties/run.py8
1 files changed, 5 insertions, 3 deletions
diff --git a/python/test/Ice/properties/run.py b/python/test/Ice/properties/run.py
index 23719647b00..5f9f3cd3571 100755
--- a/python/test/Ice/properties/run.py
+++ b/python/test/Ice/properties/run.py
@@ -26,10 +26,12 @@ import TestUtil
#
if sys.version_info[0] == 2:
configPath = "./config/\xe4\xb8\xad\xe5\x9b\xbd_client.config"
+ decodedPath = configPath.decode("utf-8")
else:
configPath = "./config/\u4e2d\u56fd_client.config"
+ decodedPath = configPath # No need to decode with Python3, strings are already Unicode
-TestUtil.createConfig(configPath.decode("utf-8"),
+TestUtil.createConfig(decodedPath,
["# Automatically generated by Ice test driver.",
"Ice.Trace.Protocol=1",
"Ice.Trace.Network=1",
@@ -39,5 +41,5 @@ TestUtil.createConfig(configPath.decode("utf-8"),
TestUtil.simpleTest()
-if os.path.exists(configPath.decode("utf-8")):
- os.remove(configPath.decode("utf-8"))
+if os.path.exists(decodedPath):
+ os.remove(decodedPath)