Fixed ICE-5433 - fixed test/Ice/properties/run.py to work with non-UTF8 locales

5 files changed, 45 insertions, 70 deletions

diff --git a/cpp/test/Ice/properties/run.py b/cpp/test/Ice/properties/run.py
index 656027bafbd..831801ae440 100755
--- a/cpp/test/Ice/properties/run.py
+++ b/cpp/test/Ice/properties/run.py
@@ -27,22 +27,17 @@ client = os.path.join(os.getcwd(), "client")
 # Write config
 #
 if sys.version_info[0] == 2:
-    configPath = "./config/\xe4\xb8\xad\xe5\x9b\xbd_client.config".decode("utf-8")
-    TestUtil.createConfig(configPath, 
-                          ["# Automatically generated by Ice test driver.", 
-                           "Ice.Trace.Protocol=1",
-                           "Ice.Trace.Network=1", 
-                           "Ice.ProgramName=PropertiesClient", 
-                           "Config.Path=./config/中国_client.config"])
+    configPath = "./config/\xe4\xb8\xad\xe5\x9b\xbd_client.config"
 else:
     configPath = "./config/\u4e2d\u56fd_client.config"
-    TestUtil.createConfig(configPath, 
-                          ["# Automatically generated by Ice test driver.", 
-                           "Ice.Trace.Protocol=1",
-                           "Ice.Trace.Network=1", 
-                           "Ice.ProgramName=PropertiesClient", 
-                           "Config.Path=" + configPath],
-                           "utf-8")
+
+TestUtil.createConfig(configPath, 
+                      ["# Automatically generated by Ice test driver.", 
+                       "Ice.Trace.Protocol=1",
+                       "Ice.Trace.Network=1", 
+                       "Ice.ProgramName=PropertiesClient", 
+                       "Config.Path=" + configPath],
+                      "utf-8")
 
 TestUtil.simpleTest(client)
 
diff --git a/cs/test/Ice/properties/run.py b/cs/test/Ice/properties/run.py
index 596b26f7782..93b9b0cb51d 100755
--- a/cs/test/Ice/properties/run.py
+++ b/cs/test/Ice/properties/run.py
@@ -25,22 +25,17 @@ import TestUtil
 # Write config
 #
 if sys.version_info[0] == 2:
-    configPath = "./config/\xe4\xb8\xad\xe5\x9b\xbd_client.config".decode("utf-8")
-    TestUtil.createConfig(configPath, 
-                          ["# Automatically generated by Ice test driver.", 
-                           "Ice.Trace.Protocol=1",
-                           "Ice.Trace.Network=1", 
-                           "Ice.ProgramName=PropertiesClient", 
-                           "Config.Path=./config/中国_client.config"])
+    configPath = "./config/\xe4\xb8\xad\xe5\x9b\xbd_client.config"
 else:
     configPath = "./config/\u4e2d\u56fd_client.config"
-    TestUtil.createConfig(configPath, 
-                          ["# Automatically generated by Ice test driver.", 
-                           "Ice.Trace.Protocol=1",
-                           "Ice.Trace.Network=1", 
-                           "Ice.ProgramName=PropertiesClient", 
-                           "Config.Path=" + configPath],
-                           "utf-8")
+
+TestUtil.createConfig(configPath, 
+                      ["# Automatically generated by Ice test driver.", 
+                       "Ice.Trace.Protocol=1",
+                       "Ice.Trace.Network=1", 
+                       "Ice.ProgramName=PropertiesClient", 
+                       "Config.Path=" + configPath],
+                      "utf-8")
 
 TestUtil.simpleTest()
 
diff --git a/java/test/Ice/properties/run.py b/java/test/Ice/properties/run.py
index 1bb3ff858e2..2c04688f961 100755
--- a/java/test/Ice/properties/run.py
+++ b/java/test/Ice/properties/run.py
@@ -25,22 +25,17 @@ import TestUtil
 # Write config
 #
 if sys.version_info[0] == 2:
-    configPath = "./config/\xe4\xb8\xad\xe5\x9b\xbd_client.config".decode("utf-8")
-    TestUtil.createConfig(configPath, 
-                          ["# Automatically generated by Ice test driver.", 
-                           "Ice.Trace.Protocol=1",
-                           "Ice.Trace.Network=1", 
-                           "Ice.ProgramName=PropertiesClient", 
-                           "Config.Path=./config/中国_client.config"])
+    configPath = "./config/\xe4\xb8\xad\xe5\x9b\xbd_client.config"
 else:
     configPath = "./config/\u4e2d\u56fd_client.config"
-    TestUtil.createConfig(configPath, 
-                          ["# Automatically generated by Ice test driver.", 
-                           "Ice.Trace.Protocol=1",
-                           "Ice.Trace.Network=1", 
-                           "Ice.ProgramName=PropertiesClient", 
-                           "Config.Path=" + configPath],
-                           "utf-8")
+
+TestUtil.createConfig(configPath, 
+                      ["# Automatically generated by Ice test driver.", 
+                       "Ice.Trace.Protocol=1",
+                       "Ice.Trace.Network=1", 
+                       "Ice.ProgramName=PropertiesClient", 
+                       "Config.Path=" + configPath],
+                      "utf-8")
 
 sys.stdout.write("starting client... ")
 sys.stdout.flush()
diff --git a/py/test/Ice/properties/run.py b/py/test/Ice/properties/run.py
index 596b26f7782..93b9b0cb51d 100755
--- a/py/test/Ice/properties/run.py
+++ b/py/test/Ice/properties/run.py
@@ -25,22 +25,17 @@ import TestUtil
 # Write config
 #
 if sys.version_info[0] == 2:
-    configPath = "./config/\xe4\xb8\xad\xe5\x9b\xbd_client.config".decode("utf-8")
-    TestUtil.createConfig(configPath, 
-                          ["# Automatically generated by Ice test driver.", 
-                           "Ice.Trace.Protocol=1",
-                           "Ice.Trace.Network=1", 
-                           "Ice.ProgramName=PropertiesClient", 
-                           "Config.Path=./config/中国_client.config"])
+    configPath = "./config/\xe4\xb8\xad\xe5\x9b\xbd_client.config"
 else:
     configPath = "./config/\u4e2d\u56fd_client.config"
-    TestUtil.createConfig(configPath, 
-                          ["# Automatically generated by Ice test driver.", 
-                           "Ice.Trace.Protocol=1",
-                           "Ice.Trace.Network=1", 
-                           "Ice.ProgramName=PropertiesClient", 
-                           "Config.Path=" + configPath],
-                           "utf-8")
+
+TestUtil.createConfig(configPath, 
+                      ["# Automatically generated by Ice test driver.", 
+                       "Ice.Trace.Protocol=1",
+                       "Ice.Trace.Network=1", 
+                       "Ice.ProgramName=PropertiesClient", 
+                       "Config.Path=" + configPath],
+                      "utf-8")
 
 TestUtil.simpleTest()
 
diff --git a/rb/test/Ice/properties/run.py b/rb/test/Ice/properties/run.py
index 596b26f7782..93b9b0cb51d 100755
--- a/rb/test/Ice/properties/run.py
+++ b/rb/test/Ice/properties/run.py
@@ -25,22 +25,17 @@ import TestUtil
 # Write config
 #
 if sys.version_info[0] == 2:
-    configPath = "./config/\xe4\xb8\xad\xe5\x9b\xbd_client.config".decode("utf-8")
-    TestUtil.createConfig(configPath, 
-                          ["# Automatically generated by Ice test driver.", 
-                           "Ice.Trace.Protocol=1",
-                           "Ice.Trace.Network=1", 
-                           "Ice.ProgramName=PropertiesClient", 
-                           "Config.Path=./config/中国_client.config"])
+    configPath = "./config/\xe4\xb8\xad\xe5\x9b\xbd_client.config"
 else:
     configPath = "./config/\u4e2d\u56fd_client.config"
-    TestUtil.createConfig(configPath, 
-                          ["# Automatically generated by Ice test driver.", 
-                           "Ice.Trace.Protocol=1",
-                           "Ice.Trace.Network=1", 
-                           "Ice.ProgramName=PropertiesClient", 
-                           "Config.Path=" + configPath],
-                           "utf-8")
+
+TestUtil.createConfig(configPath, 
+                      ["# Automatically generated by Ice test driver.", 
+                       "Ice.Trace.Protocol=1",
+                       "Ice.Trace.Network=1", 
+                       "Ice.ProgramName=PropertiesClient", 
+                       "Config.Path=" + configPath],
+                      "utf-8")
 
 TestUtil.simpleTest()