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 /cpp | |
| 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 'cpp')
| -rw-r--r-- | cpp/test/IceGrid/distribution/test.py | 2 | ||||
| -rw-r--r-- | cpp/test/IceGrid/noRestartUpdate/test.py | 4 | ||||
| -rw-r--r-- | cpp/test/IceGrid/session/test.py | 2 | ||||
| -rw-r--r-- | cpp/test/IceGrid/update/test.py | 4 | ||||
| -rw-r--r-- | cpp/test/Slice/unicodePaths/test.py | 10 |
5 files changed, 11 insertions, 11 deletions
diff --git a/cpp/test/IceGrid/distribution/test.py b/cpp/test/IceGrid/distribution/test.py index 1c7d8313781..19fc6988644 100644 --- a/cpp/test/IceGrid/distribution/test.py +++ b/cpp/test/IceGrid/distribution/test.py @@ -27,7 +27,7 @@ class IceGridDistributionTestCase(IceGridTestCase): ] current.write("creating IcePatch2 data directory... ") - self.mkdirs(datadir) + current.mkdirs(datadir) for [file, content] in files: file = os.path.join(datadir, file) diff --git a/cpp/test/IceGrid/noRestartUpdate/test.py b/cpp/test/IceGrid/noRestartUpdate/test.py index e4b1fdbd0d8..3e2d6ae42b3 100644 --- a/cpp/test/IceGrid/noRestartUpdate/test.py +++ b/cpp/test/IceGrid/noRestartUpdate/test.py @@ -12,8 +12,8 @@ class IceGridNoRestartUpdateTestCase(IceGridTestCase): def setupClientSide(self, current): IceGridTestCase.setupClientSide(self, current) - self.mkdirs("db/node1") - self.mkdirs("db/node2") + current.mkdirs("db/node1") + current.mkdirs("db/node2") clientProps = lambda process, current: { "IceBoxExe" : IceBox().getCommandLine(current), diff --git a/cpp/test/IceGrid/session/test.py b/cpp/test/IceGrid/session/test.py index e119aab24eb..53ce45a63cb 100644 --- a/cpp/test/IceGrid/session/test.py +++ b/cpp/test/IceGrid/session/test.py @@ -12,7 +12,7 @@ class IceGridSessionTestCase(IceGridTestCase): def setupClientSide(self, current): IceGridTestCase.setupClientSide(self, current) - self.mkdirs("db/node-1") + current.mkdirs("db/node-1") def setupServerSide(self, current): self.verifier = Server(exe="verifier", waitForShutdown=False, props={ diff --git a/cpp/test/IceGrid/update/test.py b/cpp/test/IceGrid/update/test.py index 8ac439aefaf..75b1c206b44 100644 --- a/cpp/test/IceGrid/update/test.py +++ b/cpp/test/IceGrid/update/test.py @@ -12,8 +12,8 @@ class IceGridUpdateTestCase(IceGridTestCase): def setupClientSide(self, current): IceGridTestCase.setupClientSide(self, current) - self.mkdirs("db/node-1") - self.mkdirs("db/node-2") + current.mkdirs("db/node-1") + current.mkdirs("db/node-2") clientProps = lambda process, current: { "NodePropertiesOverride" : current.testcase.icegridnode[0].getPropertiesOverride(current), diff --git a/cpp/test/Slice/unicodePaths/test.py b/cpp/test/Slice/unicodePaths/test.py index 95923fc10c2..ad07f3b9855 100644 --- a/cpp/test/Slice/unicodePaths/test.py +++ b/cpp/test/Slice/unicodePaths/test.py @@ -33,11 +33,11 @@ class SliceUnicodePathsTestCase(ClientTestCase): if os.path.exists(srcPath): shutil.rmtree(srcPath) os.mkdir(srcPath) - self.createFile("%s/Test.ice" % srcPath, - ["module Test { ", - "class Point{int x; int y; };", - "interface Canvas{ void draw(Point p); };", - "};"], "utf-8") + current.createFile("%s/Test.ice" % srcPath, + ["module Test { ", + "class Point{int x; int y; };", + "interface Canvas{ void draw(Point p); };", + "};"], "utf-8") tests = [ ("cpp", ["Test.cpp", "Test.h", "TestI.cpp", "TestI.h"], "--impl-c++11"), |