1 files changed, 7 insertions, 7 deletions
diff --git a/cpp/test/IceStorm/federation2/run.py b/cpp/test/IceStorm/federation2/run.py
index 0d8f087476b..2e9e30f0c76 100755
--- a/cpp/test/IceStorm/federation2/run.py
+++ b/cpp/test/IceStorm/federation2/run.py
@@ -68,7 +68,7 @@ def doTest(batch):
         pass # Ignore errors if the lockfile is not present
 
     print "starting " + name + "...",
-    command = subscriber + batchOptions + TestUtil.clientServerOptions + iceStormReference + r' ' + subscriberLockFile
+    command = subscriber + batchOptions + TestUtil.clientServerOptions + iceStormReference + r' ' + subscriberLockFile + " 2>&1"
     subscriberPipe = os.popen(command)
     TestUtil.getServerPid(subscriberPipe)
     TestUtil.getAdapterReady(subscriberPipe)
@@ -90,7 +90,7 @@ def doTest(batch):
     # causes subscriber to terminate.
     #
     print "starting publisher...",
-    command = publisher + TestUtil.clientOptions + iceStormReference
+    command = publisher + TestUtil.clientOptions + iceStormReference + " 2>&1"
     publisherPipe = os.popen(command)
     print "ok"
 
@@ -120,14 +120,14 @@ TestUtil.cleanDbDir(dbEnvName)
 iceStormDBEnv = " --IceBox.DBEnvName.IceStorm=" + dbEnvName
 
 print "starting icestorm service...",
-command = iceBox + TestUtil.clientServerOptions + iceBoxEndpoints + iceStormService + iceStormDBEnv
+command = iceBox + TestUtil.clientServerOptions + iceBoxEndpoints + iceStormService + iceStormDBEnv + " 2>&1"
 iceBoxPipe = os.popen(command)
 TestUtil.getServerPid(iceBoxPipe)
 TestUtil.waitServiceReady(iceBoxPipe, "IceStorm")
 print "ok"
 
 print "creating topics...",
-command = iceStormAdmin + TestUtil.clientOptions + iceStormReference + r' -e "create fed1 fed2 fed3"'
+command = iceStormAdmin + TestUtil.clientOptions + iceStormReference + r' -e "create fed1 fed2 fed3"' + " 2>&1"
 iceStormAdminPipe = os.popen(command)
 iceStormAdminStatus = iceStormAdminPipe.close()
 if iceStormAdminStatus:
@@ -137,7 +137,7 @@ print "ok"
 
 print "linking topics...",
 graph = os.path.join(testdir, "fed.xml");
-command = iceStormAdmin + TestUtil.clientOptions + iceStormReference + r' -e "graph ' + graph + r' 10"'
+command = iceStormAdmin + TestUtil.clientOptions + iceStormReference + r' -e "graph ' + graph + r' 10"' + " 2>&1"
 iceStormAdminPipe = os.popen(command)
 #
 # The graph command generates output. We must read it otherwise
@@ -165,7 +165,7 @@ batchStatus = doTest(1)
 # Destroy the topic.
 #
 print "destroying topics...",
-command = iceStormAdmin + TestUtil.clientOptions + iceStormReference + r' -e "destroy fed1 fed2 fed3"'
+command = iceStormAdmin + TestUtil.clientOptions + iceStormReference + r' -e "destroy fed1 fed2 fed3"' + " 2>&1"
 iceStormAdminPipe = os.popen(command)
 iceStormAdminStatus = iceStormAdminPipe.close()
 if iceStormAdminStatus:
@@ -177,7 +177,7 @@ print "ok"
 # Shutdown icestorm.
 #
 print "shutting down icestorm service...",
-command = iceBoxAdmin + TestUtil.clientOptions + iceBoxEndpoints + r' shutdown'
+command = iceBoxAdmin + TestUtil.clientOptions + iceBoxEndpoints + r' shutdown' + " 2>&1"
 iceBoxAdminPipe = os.popen(command)
 iceBoxAdminStatus = iceBoxAdminPipe.close()
 if iceBoxAdminStatus: