3.6 merge fixes

1 files changed, 12 insertions, 12 deletions

diff --git a/cpp/test/IceStorm/stress/run.py b/cpp/test/IceStorm/stress/run.py
index 23765c8174e..ea56f3ed0a5 100755
--- a/cpp/test/IceStorm/stress/run.py
+++ b/cpp/test/IceStorm/stress/run.py
@@ -31,7 +31,7 @@ if TestUtil.appverifier:
                TestUtil.getIceStormAdmin()]
     TestUtil.setAppVerifierSettings(targets, cwd = os.getcwd())
 
-def doTest(server1, subOpts, pubOpts):
+def doTest(server1, server2, subOpts, pubOpts):
 
     subscriberProcs = []
     if type(subOpts) != type([]):
@@ -80,49 +80,49 @@ def runtest(type):
 
     sys.stdout.write("Sending 5000 ordered events... ")
     sys.stdout.flush()
-    doTest(server1, '--events 5000 --qos "reliability,ordered" ' + server1.reference(), '--events 5000')
+    doTest(server1, server2, '--events 5000 --qos "reliability,ordered" ' + server1.reference(), '--events 5000')
     print("ok")
 
     runAdmin("link TestIceStorm1/fed1 TestIceStorm2/fed1")
     sys.stdout.write("Sending 5000 ordered events across a link... ")
     sys.stdout.flush()
-    doTest(server1, '--events 5000 --qos "reliability,ordered" ' + server2.reference(), '--events 5000')
+    doTest(server1, server2, '--events 5000 --qos "reliability,ordered" ' + server2.reference(), '--events 5000')
     print("ok")
 
     runAdmin("unlink TestIceStorm1/fed1 TestIceStorm2/fed1")
     sys.stdout.write("Sending 20000 unordered events... ")
     sys.stdout.flush()
-    doTest(server1, '--events 20000 ' + server1.reference(), '--events 20000 --oneway')
+    doTest(server1, server2, '--events 20000 ' + server1.reference(), '--events 20000 --oneway')
     print("ok")
 
     runAdmin("link TestIceStorm1/fed1 TestIceStorm2/fed1")
     sys.stdout.write("Sending 20000 unordered events across a link... ")
     sys.stdout.flush()
-    doTest(server1, '--events 20000 ' + server2.reference(), '--events 20000 --oneway')
+    doTest(server1, server2, '--events 20000 ' + server2.reference(), '--events 20000 --oneway')
     print("ok")
 
     runAdmin("unlink TestIceStorm1/fed1 TestIceStorm2/fed1")
     sys.stdout.write("Sending 20000 unordered batch events... ")
     sys.stdout.flush()
-    doTest(server1, '--events 20000 --qos "reliability,batch" ' + server1.reference(), '--events 20000 --oneway')
+    doTest(server1, server2, '--events 20000 --qos "reliability,batch" ' + server1.reference(), '--events 20000 --oneway')
     print("ok")
 
     runAdmin("link TestIceStorm1/fed1 TestIceStorm2/fed1")
     sys.stdout.write("Sending 20000 unordered batch events across a link... ")
     sys.stdout.flush()
-    doTest(server1, '--events 20000 --qos "reliability,batch" ' + server2.reference(), '--events 20000 --oneway')
+    doTest(server1, server2, '--events 20000 --qos "reliability,batch" ' + server2.reference(), '--events 20000 --oneway')
     print("ok")
 
     runAdmin("unlink TestIceStorm1/fed1 TestIceStorm2/fed1")
     sys.stdout.write("Sending 20000 unordered events with slow subscriber... ")
     sys.stdout.flush()
-    doTest(server1, ['--events 2 --slow ' + server1.reference(), '--events 20000 ' + server1.reference()], '--events 20000 --oneway')
+    doTest(server1, server2, ['--events 2 --slow ' + server1.reference(), '--events 20000 ' + server1.reference()], '--events 20000 --oneway')
     print("ok")
 
     runAdmin("link TestIceStorm1/fed1 TestIceStorm2/fed1")
     sys.stdout.write("Sending 20000 unordered events with slow subscriber & link... ")
     sys.stdout.flush()
-    doTest(server1, ['--events 2 --slow' + server1.reference(), '--events 20000' + server1.reference(), '--events 2 --slow' + server2.reference(), '--events 20000' + server2.reference()], '--events 20000 --oneway')
+    doTest(server1, server2, ['--events 2 --slow' + server1.reference(), '--events 20000' + server1.reference(), '--events 2 --slow' + server2.reference(), '--events 20000' + server2.reference()], '--events 20000 --oneway')
     print("ok")
 
     sys.stdout.write("shutting down icestorm services... ")
@@ -146,7 +146,7 @@ def runtest(type):
 
     sys.stdout.write("Sending 20000 unordered events with erratic subscriber... ")
     sys.stdout.flush()
-    doTest(server1,
+    doTest(server1, server2,
         [ '--erratic 5 --qos "reliability,ordered" --events 20000' + server1.reference(),
           '--erratic 5 --events 20000' + server1.reference(),
           '--events 20000' + server1.reference()],
@@ -179,7 +179,7 @@ def runtest(type):
     sys.stdout.flush()
     opts = " --IceStorm.Send.QueueSizeMax=2000 --IceStorm.Send.QueueSizeMaxPolicy=DropEvents"
     server1.start(echo=False, additionalOptions = opts)
-    doTest(server1,
+    doTest(server1, server2,
            '--events 5000 --qos "reliability,ordered" --maxQueueDropEvents=2000 ' + server1.reference(),
            '--events 5000 --maxQueueTest')
     server1.stop()
@@ -189,7 +189,7 @@ def runtest(type):
     sys.stdout.flush()
     opts = " --IceStorm.Send.QueueSizeMax=2000 --IceStorm.Send.QueueSizeMaxPolicy=RemoveSubscriber"
     server1.start(echo=False, additionalOptions = opts)
-    doTest(server1,
+    doTest(server1, server2,
            '--events 5000 --qos "reliability,ordered" --maxQueueRemoveSub=2000 ' + server1.reference(),
            '--events 5000 --maxQueueTest')
     server1.stop()