diff options
| author | Jose <jose@zeroc.com> | 2016-02-26 20:46:27 +0100 |
|---|---|---|
| committer | Jose <jose@zeroc.com> | 2016-02-26 20:46:27 +0100 |
| commit | 62cba8cd46a535585a4422daab489f114feab6f3 (patch) | |
| tree | c77e9cec24a570b06024a3c6a1552b8e6eb20ec6 /cpp/test/IceGrid/admin/run.py | |
| parent | updating changelog for ICE-6844 (diff) | |
| download | ice-62cba8cd46a535585a4422daab489f114feab6f3.tar.bz2 ice-62cba8cd46a535585a4422daab489f114feab6f3.tar.xz ice-62cba8cd46a535585a4422daab489f114feab6f3.zip | |
Windows msbuild build updates
Diffstat (limited to 'cpp/test/IceGrid/admin/run.py')
| -rwxr-xr-x | cpp/test/IceGrid/admin/run.py | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/cpp/test/IceGrid/admin/run.py b/cpp/test/IceGrid/admin/run.py index 04c782c19f4..fa6c9f1a7cb 100755 --- a/cpp/test/IceGrid/admin/run.py +++ b/cpp/test/IceGrid/admin/run.py @@ -113,7 +113,7 @@ args = ' --Ice.Default.Locator="TestIceGrid/Locator:default -p 12010"' + \ ' --IceGridAdmin.Password=dummy' admin = TestUtil.startClient(icegridadmin, args, None, None, False) admin.expect('>>> ') -admin.sendline('application add application.xml') +admin.sendline('application add application.xml server.dir=%s' % TestUtil.getTestDirectory("server")) admin.expect('>>> ') admin.sendline('application list') admin.expect('Test') @@ -121,10 +121,10 @@ admin.sendline('application describe Test') admin.expect('application `Test\'') admin.expect('\{.*\}') admin.expect('>>> ') -admin.sendline('application diff application.xml') +admin.sendline('application diff application.xml server.dir=%s' % TestUtil.getTestDirectory("server")) admin.expect('application `Test\'\n\{.*\}') admin.expect('>>> ') -admin.sendline('application update application.xml') +admin.sendline('application update application.xml server.dir=%s' % TestUtil.getTestDirectory("server")) admin.expect('>>> ') admin.sendline('application patch Test') admin.expect('>>> ') @@ -164,7 +164,7 @@ admin.expect('test') admin.expect('>>> ') admin.sendline('object describe') admin.expect('proxy = `.*\' type = `.*\'') -admin.expect('>>> ') +admin.expect('>>> ') admin.sendline('object find Test') admin.expect('test') admin.expect('>>> ') |