diff options
| author | Benoit Foucher <benoit@zeroc.com> | 2017-01-05 17:50:47 +0100 |
|---|---|---|
| committer | Benoit Foucher <benoit@zeroc.com> | 2017-01-05 17:50:47 +0100 |
| commit | 486ebe5c7c2d768b884ae85c4fea2c692d0b4f29 (patch) | |
| tree | a6b15265690e110370e6f1036680ed068d5cd3c7 /scripts/tests | |
| parent | Fixed macOS PHP testing bug when running against binary distribution (diff) | |
| download | ice-486ebe5c7c2d768b884ae85c4fea2c692d0b4f29.tar.bz2 ice-486ebe5c7c2d768b884ae85c4fea2c692d0b4f29.tar.xz ice-486ebe5c7c2d768b884ae85c4fea2c692d0b4f29.zip | |
Fixed ICE-7478 - concurrent file access
Diffstat (limited to 'scripts/tests')
| -rw-r--r-- | scripts/tests/Ice/properties.py | 14 | ||||
| -rw-r--r-- | scripts/tests/Slice/generation.py | 2 |
2 files changed, 8 insertions, 8 deletions
diff --git a/scripts/tests/Ice/properties.py b/scripts/tests/Ice/properties.py index f0a862ad735..d70d2c1b303 100644 --- a/scripts/tests/Ice/properties.py +++ b/scripts/tests/Ice/properties.py @@ -12,12 +12,12 @@ class PropertiesTestSuite(TestSuite): def setup(self, current): name = "\xe4\xb8\xad\xe5\x9b\xbd_client.config" if isPython2 else "\u4e2d\u56fd_client.config" - self.createFile("./config/" + name, - ["# Automatically generated by Ice test driver.", - "Ice.Trace.Protocol=1", - "Ice.Trace.Network=1", - "Ice.ProgramName=PropertiesClient", - "Config.Path=./config/" + name], - "utf-8") + current.createFile("./config/" + name, + ["# Automatically generated by Ice test driver.", + "Ice.Trace.Protocol=1", + "Ice.Trace.Network=1", + "Ice.ProgramName=PropertiesClient", + "Config.Path=./config/" + name], + "utf-8") PropertiesTestSuite(__name__, [ ClientTestCase(client=Client(args=["{testdir}"])) ]) diff --git a/scripts/tests/Slice/generation.py b/scripts/tests/Slice/generation.py index c6752e76eb1..ddd4c949110 100644 --- a/scripts/tests/Slice/generation.py +++ b/scripts/tests/Slice/generation.py @@ -4,7 +4,7 @@ class SliceGenerationTestCase(ClientTestCase): current.write("testing list-generated... ") slice2java = SliceTranslator("slice2java") - self.mkdirs("classes") + current.mkdirs("classes") slice2java.run(current, args=["--list-generated", "--output-dir", "classes", "File1.ice", "File2.ice"] + |