summaryrefslogtreecommitdiff
path: root/cpp/test/IceGrid
diff options
context:
space:
mode:
Diffstat (limited to 'cpp/test/IceGrid')
-rw-r--r--cpp/test/IceGrid/admin/test.py196
-rw-r--r--cpp/test/IceGrid/fileLock/test.py2
2 files changed, 99 insertions, 99 deletions
diff --git a/cpp/test/IceGrid/admin/test.py b/cpp/test/IceGrid/admin/test.py
index 0d851f49cd1..58bd2be8375 100644
--- a/cpp/test/IceGrid/admin/test.py
+++ b/cpp/test/IceGrid/admin/test.py
@@ -21,19 +21,19 @@ class IceGridAdminTestCase(IceGridTestCase):
admin=IceGridAdmin()
admin.start(current)
- admin.expect('>>> ')
- admin.sendline("server list")
- admin.expect('>>> ')
- admin.sendline('exit')
+ admin.expect(current, '>>> ')
+ admin.sendline(current, "server list")
+ admin.expect(current, '>>> ')
+ admin.sendline(current, 'exit')
admin.stop(current, True)
defaultRouterProps = { "Ice.Default.Router" : self.glacier2router.getClientProxy(current) }
admin.start(current, props=defaultRouterProps)
- admin.expect('>>> ')
- admin.sendline("server list")
- admin.expect('>>> ')
- admin.sendline('exit')
+ admin.expect(current, '>>> ')
+ admin.sendline(current, "server list")
+ admin.expect(current, '>>> ')
+ admin.sendline(current, 'exit')
admin.stop(current, True)
current.writeln("ok")
@@ -44,18 +44,18 @@ class IceGridAdminTestCase(IceGridTestCase):
# Direct registry connection with SSL
admin.start(current, args=["--ssl"])
- admin.expect('>>> ')
- admin.sendline("server list")
- admin.expect('>>> ')
- admin.sendline('exit')
+ admin.expect(current, '>>> ')
+ admin.sendline(current, "server list")
+ admin.expect(current, '>>> ')
+ admin.sendline(current, 'exit')
admin.stop(current, True)
# Glacier2 connection with username/password
admin.start(current, args=["--ssl"], props=defaultRouterProps)
- admin.expect('>>> ')
- admin.sendline("server list")
- admin.expect('>>> ')
- admin.sendline('exit')
+ admin.expect(current, '>>> ')
+ admin.sendline(current, "server list")
+ admin.expect(current, '>>> ')
+ admin.sendline(current, 'exit')
admin.stop(current, True)
current.writeln("ok")
@@ -65,88 +65,88 @@ class IceGridAdminTestCase(IceGridTestCase):
try:
serverDir = current.getBuildDir("server")
- admin.expect('>>> ')
- admin.sendline('application add application.xml server.dir=%s' % serverDir)
- admin.expect('>>> ')
- admin.sendline('application list')
- admin.expect('Test')
- admin.sendline('application describe Test')
- admin.expect('application `Test\'')
- admin.expect('\{.*\}')
- admin.expect('>>> ')
- admin.sendline('application diff application.xml server.dir=%s' % serverDir)
- admin.expect('application `Test\'\n\{.*\}')
- admin.expect('>>> ')
- admin.sendline('application update application.xml server.dir=%s' % serverDir)
- admin.expect('>>> ')
- admin.sendline('application patch Test')
- admin.expect('>>> ')
- admin.sendline('server list')
- admin.expect('server')
- admin.expect('>>> ')
- admin.sendline('server describe server')
- admin.expect('server `server\'\n\{.*\}')
- admin.expect('>>> ')
- admin.sendline('server start server')
- admin.expect('>>> ')
- admin.sendline('server state server')
- admin.expect('^active \(.*\)')
- admin.expect('>>> ')
- admin.sendline('server pid server')
- admin.expect('[0-9]+')
- admin.expect('>>> ')
- admin.sendline('server properties server')
- admin.expect('>>> ')
- admin.sendline('server property server Ice.Admin.ServerId')
- admin.expect("^server")
- admin.expect('>>> ')
- admin.sendline('server patch server')
- admin.expect('>>> ')
- admin.sendline('server disable server')
- admin.expect('>>> ')
- admin.sendline('server enable server')
- admin.expect('>>> ')
- admin.sendline('adapter list')
- admin.expect('TestAdapter')
- admin.expect('>>> ')
- admin.sendline('adapter endpoints TestAdapter')
- admin.expect(['tcp', 'ssl', 'ws', 'wss'])
- admin.expect('>>> ')
- admin.sendline('object list')
- admin.expect('test')
- admin.expect('>>> ')
- admin.sendline('object describe')
- admin.expect('proxy = `.*\' type = `.*\'')
- admin.expect('>>> ')
- admin.sendline('object find Test')
- admin.expect('test')
- admin.expect('>>> ')
- admin.sendline('server stop server')
- admin.expect('>>> ')
- admin.sendline('application remove Test')
- admin.expect('>>> ')
- admin.sendline('registry list')
- admin.expect('Master')
- admin.expect('>>> ')
- admin.sendline('registry ping Master')
- admin.expect('registry is up')
- admin.expect('>>> ')
- admin.sendline('registry describe Master')
- admin.expect('registry `Master\'\n{.*}')
- admin.expect('>>> ')
- admin.sendline('node list')
- admin.expect('localnode')
- admin.expect('>>> ')
- admin.sendline('node describe localnode')
- admin.expect('node `localnode\'\n{.*}')
- admin.expect('>>> ')
- admin.sendline('node load localnode')
- admin.expect('load average.*\n')
- admin.expect('>>> ')
- admin.sendline('node ping localnode')
- admin.expect('node is up')
- admin.expect('>>> ')
- admin.sendline('exit')
+ admin.expect(current, '>>> ')
+ admin.sendline(current, 'application add application.xml server.dir=%s' % serverDir)
+ admin.expect(current, '>>> ')
+ admin.sendline(current, 'application list')
+ admin.expect(current, 'Test')
+ admin.sendline(current, 'application describe Test')
+ admin.expect(current, 'application `Test\'')
+ admin.expect(current, '\{.*\}')
+ admin.expect(current, '>>> ')
+ admin.sendline(current, 'application diff application.xml server.dir=%s' % serverDir)
+ admin.expect(current, 'application `Test\'\n\{.*\}')
+ admin.expect(current, '>>> ')
+ admin.sendline(current, 'application update application.xml server.dir=%s' % serverDir)
+ admin.expect(current, '>>> ')
+ admin.sendline(current, 'application patch Test')
+ admin.expect(current, '>>> ')
+ admin.sendline(current, 'server list')
+ admin.expect(current, 'server')
+ admin.expect(current, '>>> ')
+ admin.sendline(current, 'server describe server')
+ admin.expect(current, 'server `server\'\n\{.*\}')
+ admin.expect(current, '>>> ')
+ admin.sendline(current, 'server start server')
+ admin.expect(current, '>>> ')
+ admin.sendline(current, 'server state server')
+ admin.expect(current, '^active \(.*\)')
+ admin.expect(current, '>>> ')
+ admin.sendline(current, 'server pid server')
+ admin.expect(current, '[0-9]+')
+ admin.expect(current, '>>> ')
+ admin.sendline(current, 'server properties server')
+ admin.expect(current, '>>> ')
+ admin.sendline(current, 'server property server Ice.Admin.ServerId')
+ admin.expect(current, "^server")
+ admin.expect(current, '>>> ')
+ admin.sendline(current, 'server patch server')
+ admin.expect(current, '>>> ')
+ admin.sendline(current, 'server disable server')
+ admin.expect(current, '>>> ')
+ admin.sendline(current, 'server enable server')
+ admin.expect(current, '>>> ')
+ admin.sendline(current, 'adapter list')
+ admin.expect(current, 'TestAdapter')
+ admin.expect(current, '>>> ')
+ admin.sendline(current, 'adapter endpoints TestAdapter')
+ admin.expect(current, ['tcp', 'ssl', 'ws', 'wss'])
+ admin.expect(current, '>>> ')
+ admin.sendline(current, 'object list')
+ admin.expect(current, 'test')
+ admin.expect(current, '>>> ')
+ admin.sendline(current, 'object describe')
+ admin.expect(current, 'proxy = `.*\' type = `.*\'')
+ admin.expect(current, '>>> ')
+ admin.sendline(current, 'object find Test')
+ admin.expect(current, 'test')
+ admin.expect(current, '>>> ')
+ admin.sendline(current, 'server stop server')
+ admin.expect(current, '>>> ')
+ admin.sendline(current, 'application remove Test')
+ admin.expect(current, '>>> ')
+ admin.sendline(current, 'registry list')
+ admin.expect(current, 'Master')
+ admin.expect(current, '>>> ')
+ admin.sendline(current, 'registry ping Master')
+ admin.expect(current, 'registry is up')
+ admin.expect(current, '>>> ')
+ admin.sendline(current, 'registry describe Master')
+ admin.expect(current, 'registry `Master\'\n{.*}')
+ admin.expect(current, '>>> ')
+ admin.sendline(current, 'node list')
+ admin.expect(current, 'localnode')
+ admin.expect(current, '>>> ')
+ admin.sendline(current, 'node describe localnode')
+ admin.expect(current, 'node `localnode\'\n{.*}')
+ admin.expect(current, '>>> ')
+ admin.sendline(current, 'node load localnode')
+ admin.expect(current, 'load average.*\n')
+ admin.expect(current, '>>> ')
+ admin.sendline(current, 'node ping localnode')
+ admin.expect(current, 'node is up')
+ admin.expect(current, '>>> ')
+ admin.sendline(current, 'exit')
admin.stop(current, True)
current.writeln("ok")
except Exception as e:
diff --git a/cpp/test/IceGrid/fileLock/test.py b/cpp/test/IceGrid/fileLock/test.py
index 9a9ee60ece1..a15d0099bee 100644
--- a/cpp/test/IceGrid/fileLock/test.py
+++ b/cpp/test/IceGrid/fileLock/test.py
@@ -15,7 +15,7 @@ class IceGridAdminTestCase(IceGridTestCase):
sys.stdout.write("testing IceGrid file lock... ")
registry = IceGridRegistryMaster(portnum=25, readyCount=0, quiet=True);
registry.start(current)
- registry.expect(".*IceUtil::FileLockException.*")
+ registry.expect(current, ".*IceUtil::FileLockException.*")
registry.stop(current, False)
print("ok")
generated by cgit v1.2.3 (git 2.46.0) at 2025-08-03 12:15:30 +0000