summaryrefslogtreecommitdiff
path: root/cpp/test
diff options
context:
space:
mode:
Diffstat (limited to 'cpp/test')
-rw-r--r--cpp/test/IceGrid/admin/test.py196
-rw-r--r--cpp/test/IceGrid/fileLock/test.py2
-rw-r--r--cpp/test/IceStorm/federation2/test.py4
-rw-r--r--cpp/test/IceStorm/rep1/test.py4
-rw-r--r--cpp/test/IceStorm/repstress/test.py16
-rw-r--r--cpp/test/Slice/errorDetection/test.py2
6 files changed, 112 insertions, 112 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")
diff --git a/cpp/test/IceStorm/federation2/test.py b/cpp/test/IceStorm/federation2/test.py
index 5ac2f315555..213ab8d9e0c 100644
--- a/cpp/test/IceStorm/federation2/test.py
+++ b/cpp/test/IceStorm/federation2/test.py
@@ -93,7 +93,7 @@ class IceStormFederation2TestCase(IceStormTestCase):
# Give some time for the output to be sent.
time.sleep(2)
- icestorm1[0].expect("topic.fed1.*subscriber offline")
+ icestorm1[0].expect(current, "topic.fed1.*subscriber offline")
current.writeln("ok")
current.write("starting downstream icestorm server... ")
@@ -113,7 +113,7 @@ class IceStormFederation2TestCase(IceStormTestCase):
current.writeln("ok")
try:
- icestorm1[0].expect("topic.fed1.*subscriber offline", timeout=1)
+ icestorm1[0].expect(current, "topic.fed1.*subscriber offline", timeout=1)
assert False
except Expect.TIMEOUT:
pass
diff --git a/cpp/test/IceStorm/rep1/test.py b/cpp/test/IceStorm/rep1/test.py
index 7385a9d8d25..3c9ba79776b 100644
--- a/cpp/test/IceStorm/rep1/test.py
+++ b/cpp/test/IceStorm/rep1/test.py
@@ -62,7 +62,7 @@ class IceStormRep1TestCase(IceStormTestCase):
readyCount=0,
quiet=True)
subscriber.run(current, exitstatus=1 if expect else 0)
- checkExpect(subscriber.getOutput(), expect)
+ checkExpect(subscriber.getOutput(current), expect)
def rununsub2(replica=None, expect=None):
sub = Subscriber(exe="sub",
@@ -77,7 +77,7 @@ class IceStormRep1TestCase(IceStormTestCase):
# shouldn't get an AlreadySubscribedException.
sub.run(current, exitstatus=1 if expect else 0)
if expect:
- checkExpect(sub.getOutput(), expect)
+ checkExpect(sub.getOutput(current), expect)
return
sub.run(current, args=["--unsub"])
diff --git a/cpp/test/IceStorm/repstress/test.py b/cpp/test/IceStorm/repstress/test.py
index f61befa8961..8f0687cfa36 100644
--- a/cpp/test/IceStorm/repstress/test.py
+++ b/cpp/test/IceStorm/repstress/test.py
@@ -42,15 +42,15 @@ class IceStormRepStressTestCase(IceStormTestCase):
current.write("running subscriber... ")
subscriber = Subscriber(quiet=True)
subscriber.start(current)
- subscriber.expect("([^\n]+)\n")
- subControl = subscriber.process.match.group(1)
+ subscriber.expect(current, "([^\n]+)\n")
+ subControl = subscriber.getMatch(current).group(1)
current.writeln("ok")
current.write("running publisher... ")
publisher = Publisher(quiet=True)
publisher.start(current)
- publisher.expect("([^\n]+)\n")
- pubControl = publisher.process.match.group(1)
+ publisher.expect(current, "([^\n]+)\n")
+ pubControl = publisher.getMatch(current).group(1)
current.writeln("ok")
time.sleep(2)
@@ -89,8 +89,8 @@ class IceStormRepStressTestCase(IceStormTestCase):
current.write("stopping publisher... ")
Client(exe="control", args=[pubControl]).run(current)
- publisher.expect("([^\n]+)\n")
- publisherCount = publisher.process.match.group(1)
+ publisher.expect(current, "([^\n]+)\n")
+ publisherCount = publisher.getMatch(current).group(1)
publisher.stop(current, True)
current.writeln("ok")
@@ -100,8 +100,8 @@ class IceStormRepStressTestCase(IceStormTestCase):
current.write("stopping subscriber... ")
Client(exe="control", args=[subControl]).run(current)
- subscriber.expect("([^\n]+)\n")
- subscriberCount = subscriber.process.match.group(1)
+ subscriber.expect(current, "([^\n]+)\n")
+ subscriberCount = subscriber.getMatch(current).group(1)
subscriber.stop(current, True)
current.writeln("ok")
diff --git a/cpp/test/Slice/errorDetection/test.py b/cpp/test/Slice/errorDetection/test.py
index 71953c3086c..32eec3e3f66 100644
--- a/cpp/test/Slice/errorDetection/test.py
+++ b/cpp/test/Slice/errorDetection/test.py
@@ -27,7 +27,7 @@ class SliceErrorDetectionTestCase(ClientTestCase):
# Don't print out slice2cpp output and expect failures
slice2cpp.run(current, args=args, exitstatus=1)
- output = slice2cpp.getOutput()
+ output = slice2cpp.getOutput(current)
regex1 = re.compile("\.ice$", re.IGNORECASE)
lines1 = output.strip().split("\n")
generated by cgit v1.2.3 (git 2.46.0) at 2025-08-03 11:48:09 +0000