diff options
| author | Michi Henning <michi@zeroc.com> | 2009-12-09 15:12:12 +1000 |
|---|---|---|
| committer | Michi Henning <michi@zeroc.com> | 2009-12-09 15:12:12 +1000 |
| commit | d0d27bb7cf7b5ff8f9f3028f63f650f1d0b01678 (patch) | |
| tree | 9524523d712bca42f6bd36fabd72c76371ecdca8 /cpp/test/IceGrid/fileLock/run.py | |
| parent | Merge branch 'master' of ssh://cvs.zeroc.com/home/git/ice (diff) | |
| parent | fix for cpp/test/Ice/Makefile.mak (diff) | |
| download | ice-d0d27bb7cf7b5ff8f9f3028f63f650f1d0b01678.tar.bz2 ice-d0d27bb7cf7b5ff8f9f3028f63f650f1d0b01678.tar.xz ice-d0d27bb7cf7b5ff8f9f3028f63f650f1d0b01678.zip | |
Merge branch 'master' of ssh://cvs.zeroc.com/home/git/ice
Diffstat (limited to 'cpp/test/IceGrid/fileLock/run.py')
| -rwxr-xr-x | cpp/test/IceGrid/fileLock/run.py | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/cpp/test/IceGrid/fileLock/run.py b/cpp/test/IceGrid/fileLock/run.py index b580890bce1..84ac73f0339 100755 --- a/cpp/test/IceGrid/fileLock/run.py +++ b/cpp/test/IceGrid/fileLock/run.py @@ -29,14 +29,12 @@ def runIceGridRegistry(testdir): command = ' --nowarn ' + IceGridAdmin.registryOptions - name = "registry" - - dataDir = os.path.join(testdir, "db", name) + dataDir = os.path.join(testdir, "db") if not os.path.exists(dataDir): os.mkdir(dataDir) cmd = command + ' ' + TestUtil.getQtSqlOptions('IceGrid') + \ - r' --Ice.ProgramName=' + name + \ + r' --Ice.ProgramName=registry' + \ r' --IceGrid.Registry.Client.Endpoints="default -p ' + str(IceGridAdmin.iceGridPort) + '" ' + \ r' --IceGrid.Registry.Data=' + dataDir @@ -47,7 +45,7 @@ def runIceGridRegistry(testdir): proc = TestUtil.spawn(cmd) return proc -IceGridAdmin.cleanDbDir("./db/registry") +IceGridAdmin.cleanDbDir("./db") print "testing IceGrid file lock...", iceGrid1 = runIceGridRegistry(".") @@ -58,4 +56,4 @@ iceGrid2.expect(".*IceUtil::FileLockedException.*") print "ok" IceGridAdmin.iceGridAdmin("registry shutdown") -IceGridAdmin.cleanDbDir("./db/registry") +IceGridAdmin.cleanDbDir("./db") |