3 files changed, 12 insertions, 12 deletions
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")