Redirected stderr to stdout in all popen calls

1 files changed, 8 insertions, 8 deletions

diff --git a/cpp/config/IcePackAdmin.py b/cpp/config/IcePackAdmin.py
index 9503725e74c..bd2437ea2a9 100644
--- a/cpp/config/IcePackAdmin.py
+++ b/cpp/config/IcePackAdmin.py
@@ -128,7 +128,7 @@ def shutdownIcePackRegistry():
     print "shutting down icepack registry...",
     command = icePackAdmin + TestUtil.clientOptions + \
               r' "--Ice.Default.Locator=IcePack/Locator:default -p ' + icePackPort + '" ' + \
-              r' -e "shutdown" '
+              r' -e "shutdown" ' + " 2>&1"
 
     icePackAdminPipe = os.popen(command)
     TestUtil.printOutputFromPipe(icePackAdminPipe)
@@ -146,7 +146,7 @@ def shutdownIcePackNode():
     print "shutting down icepack node...",
     command = icePackAdmin + TestUtil.clientOptions + \
               r' "--Ice.Default.Locator=IcePack/Locator:default -p ' + icePackPort + '" ' + \
-              r' -e "node shutdown localnode" '
+              r' -e "node shutdown localnode" ' + " 2>&1"
 
     icePackAdminPipe = os.popen(command)
     TestUtil.printOutputFromPipe(icePackAdminPipe)
@@ -164,7 +164,7 @@ def addApplication(descriptor, targets):
     descriptor = descriptor.replace("\\", "/")
     command = icePackAdmin + TestUtil.clientOptions + \
               r' "--Ice.Default.Locator=IcePack/Locator:default -p ' + icePackPort + '" ' + \
-              r' -e "application add \"' + descriptor + '\\" ' + targets + ' \"'
+              r' -e "application add \"' + descriptor + '\\" ' + targets + ' \"' + " 2>&1"
 
     icePackAdminPipe = os.popen(command)
     icePackAdminStatus = icePackAdminPipe.close()
@@ -180,7 +180,7 @@ def removeApplication(descriptor):
     descriptor = descriptor.replace("\\", "/")
     command = icePackAdmin + TestUtil.clientOptions + \
               r' "--Ice.Default.Locator=IcePack/Locator:default -p ' + icePackPort + '" ' + \
-              r' -e "application remove \"' + descriptor + '\\" \"'
+              r' -e "application remove \"' + descriptor + '\\" \"' + " 2>&1"
 
     icePackAdminPipe = os.popen(command)
     TestUtil.printOutputFromPipe(icePackAdminPipe)
@@ -200,7 +200,7 @@ def addServer(name, serverDescriptor, server, libpath, targets):
     command = icePackAdmin + TestUtil.clientOptions + \
               r' "--Ice.Default.Locator=IcePack/Locator:default -p ' + icePackPort + '" ' + \
               r' -e "server add localnode \"' + name + '\\" \\"' + serverDescriptor + '\\" ' + \
-              r' \"' + server + '\\" \\"' + libpath + '\\" ' + targets + '\"'
+              r' \"' + server + '\\" \\"' + libpath + '\\" ' + targets + '\"' + " 2>&1"
 
     icePackAdminPipe = os.popen(command)
     icePackAdminStatus = icePackAdminPipe.close()
@@ -216,7 +216,7 @@ def removeServer(name):
 
     command = icePackAdmin + TestUtil.clientOptions + \
               r' "--Ice.Default.Locator=IcePack/Locator:default -p ' + icePackPort + '" ' + \
-              r' -e "server remove \"' + name + '\\" \"'
+              r' -e "server remove \"' + name + '\\" \"' + " 2>&1"
 
     icePackAdminPipe = os.popen(command)
     icePackAdminStatus = icePackAdminPipe.close()
@@ -231,7 +231,7 @@ def startServer(name):
 
     command = icePackAdmin + TestUtil.clientOptions + \
               r' "--Ice.Default.Locator=IcePack/Locator:default -p ' + icePackPort + '" ' + \
-              r' -e "server start \"' + name + '\\""'
+              r' -e "server start \"' + name + '\\""' + " 2>&1"
 
     icePackAdminPipe = os.popen(command)
     icePackAdminStatus = icePackAdminPipe.close()
@@ -246,7 +246,7 @@ def listAdapters():
 
     command = icePackAdmin + TestUtil.clientOptions + \
               r' "--Ice.Default.Locator=IcePack/Locator:default -p ' + icePackPort + '" ' + \
-              r' -e "adapter list"'
+              r' -e "adapter list"' + " 2>&1"
 
     icePackAdminPipe = os.popen(command)
     return icePackAdminPipe