diff options
| author | Benoit Foucher <benoit@zeroc.com> | 2017-03-03 12:01:07 +0100 |
|---|---|---|
| committer | Benoit Foucher <benoit@zeroc.com> | 2017-03-03 12:01:07 +0100 |
| commit | 55f0c71ba6c4b2e9dc89f1c9be10cf89de173f9b (patch) | |
| tree | 5325e8a791ec334d29ad34d4d7bd195e38e9f5e5 /scripts/Glacier2Util.py | |
| parent | Revert "Fix (ICE-7634) Windows SDK version for building Ice" (diff) | |
| download | ice-55f0c71ba6c4b2e9dc89f1c9be10cf89de173f9b.tar.bz2 ice-55f0c71ba6c4b2e9dc89f1c9be10cf89de173f9b.tar.xz ice-55f0c71ba6c4b2e9dc89f1c9be10cf89de173f9b.zip | |
Fixed ICE-7478 - Glacier2 tests issues with passwords file removed conccurrently
Diffstat (limited to 'scripts/Glacier2Util.py')
| -rw-r--r-- | scripts/Glacier2Util.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/scripts/Glacier2Util.py b/scripts/Glacier2Util.py index 58d26ed6116..72bca7c6bca 100644 --- a/scripts/Glacier2Util.py +++ b/scripts/Glacier2Util.py @@ -20,7 +20,7 @@ class Glacier2Router(ProcessFromBinDir, Server): def setup(self, current): if self.passwords: - path = os.path.join(current.testcase.getPath(), "passwords") + path = os.path.join(current.testsuite.getPath(), "passwords") with open(path, "w") as file: command = "\"%s\" %s" % (sys.executable, os.path.abspath(os.path.join(toplevel, "scripts", "icehashpassword.py"))) @@ -54,7 +54,7 @@ class Glacier2Router(ProcessFromBinDir, Server): "Ice.Admin.InstanceName" : "Glacier2", }) if self.passwords: - props["Glacier2.CryptPasswords"] = os.path.join("{testdir}", "passwords") + props["Glacier2.CryptPasswords"] = os.path.join(current.testsuite.getPath(), "passwords") if isinstance(current.testcase.getTestSuite(), Glacier2TestSuite): # Add the properties provided by the Glacier2TestSuite routerProps parameter. props.update(current.testcase.getTestSuite().getRouterProps(self, current)) |