fixing Solaris issues

3 files changed, 23 insertions, 43 deletions

diff --git a/cpp/test/IceStorm/federation/Subscriber.cpp b/cpp/test/IceStorm/federation/Subscriber.cpp
index 8535fccc373..f5aa3411508 100644
--- a/cpp/test/IceStorm/federation/Subscriber.cpp
+++ b/cpp/test/IceStorm/federation/Subscriber.cpp
@@ -127,8 +127,6 @@ run(int argc, char* argv[], const CommunicatorPtr& communicator)
 	}
     }
 
-    createLock(lockfile);
-
     const char* managerProxyProperty = "IceStorm.TopicManager.Proxy";
     string managerProxy = properties->getProperty(managerProxyProperty);
     if(managerProxy.empty())
@@ -180,6 +178,8 @@ run(int argc, char* argv[], const CommunicatorPtr& communicator)
 	return EXIT_FAILURE;
     }
 
+    createLock(lockfile);
+
     communicator->waitForShutdown();
 
     test(eventFed1->count() == 30);
diff --git a/cpp/test/IceStorm/federation/run.py b/cpp/test/IceStorm/federation/run.py
index 2eab33fb5e6..9d323587085 100755
--- a/cpp/test/IceStorm/federation/run.py
+++ b/cpp/test/IceStorm/federation/run.py
@@ -70,10 +70,14 @@ def doTest(batch):
     print "ok"
 
     print "checking " + name + " lockfile creation...",
-    if not os.path.isfile(subscriberLockFile):
-        print "failed!"
-        TestUtil.killServers()
-        sys.exit(1)
+    lockCount = 0
+    while not os.path.isfile(subscriberLockFile):
+        if lockCount > 10:
+            print "failed!"
+            TestUtil.killServers()
+            sys.exit(1)
+        time.sleep(1)
+        lockCount = lockCount + 1    
     print "ok"
 
     #
@@ -152,22 +156,10 @@ onewayStatus = doTest(0)
 batchStatus = doTest(1)
 
 #
-# Destroy the topic.
+# Destroy the topics.
 #
 print "destroying topics...",
-command = iceStormAdmin + TestUtil.clientOptions + iceStormReference + r' -e "destroy fed1"'
-iceStormAdminPipe = os.popen(command)
-iceStormAdminStatus = iceStormAdminPipe.close()
-if iceStormAdminStatus:
-    TestUtil.killServers()
-    sys.exit(1)
-command = iceStormAdmin + TestUtil.clientOptions + iceStormReference + r' -e "destroy fed2"'
-iceStormAdminPipe = os.popen(command)
-iceStormAdminStatus = iceStormAdminPipe.close()
-if iceStormAdminStatus:
-    TestUtil.killServers()
-    sys.exit(1)
-command = iceStormAdmin + TestUtil.clientOptions + iceStormReference + r' -e "destroy fed3"'
+command = iceStormAdmin + TestUtil.clientOptions + iceStormReference + r' -e "destroy fed1 fed2 fed3"'
 iceStormAdminPipe = os.popen(command)
 iceStormAdminStatus = iceStormAdminPipe.close()
 if iceStormAdminStatus:
diff --git a/cpp/test/IceStorm/federation2/run.py b/cpp/test/IceStorm/federation2/run.py
index fb9973c5c88..ba1d05edf08 100755
--- a/cpp/test/IceStorm/federation2/run.py
+++ b/cpp/test/IceStorm/federation2/run.py
@@ -72,10 +72,14 @@ def doTest(batch):
     print "ok"
 
     print "checking " + name + " lockfile creation...",
-    if not os.path.isfile(subscriberLockFile):
-        print "failed!"
-        TestUtil.killServers()
-        sys.exit(1)
+    lockCount = 0
+    while not os.path.isfile(subscriberLockFile):
+        if lockCount > 10:
+            print "failed!"
+            TestUtil.killServers()
+            sys.exit(1)
+        time.sleep(1)
+        lockCount = lockCount + 1    
     print "ok"
 
     #
@@ -129,16 +133,12 @@ if iceStormAdminStatus:
     sys.exit(1)
 print "ok"
 
-#
-# TODO: for a an unknown reason, we get a status failure on Solaris
-# This needs to be investigated and fixed.
-#
 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" > /dev/null'
 iceStormAdminPipe = os.popen(command)
 iceStormAdminStatus = iceStormAdminPipe.close()
-if iceStormAdminStatus and TestUtil.isSolaris() == 0:
+if iceStormAdminStatus:
     TestUtil.killServers()
     sys.exit(1)
 print "ok"
@@ -156,19 +156,7 @@ batchStatus = doTest(1)
 # Destroy the topic.
 #
 print "destroying topics...",
-command = iceStormAdmin + TestUtil.clientOptions + iceStormReference + r' -e "destroy fed1"'
-iceStormAdminPipe = os.popen(command)
-iceStormAdminStatus = iceStormAdminPipe.close()
-if iceStormAdminStatus:
-    TestUtil.killServers()
-    sys.exit(1)
-command = iceStormAdmin + TestUtil.clientOptions + iceStormReference + r' -e "destroy fed2"'
-iceStormAdminPipe = os.popen(command)
-iceStormAdminStatus = iceStormAdminPipe.close()
-if iceStormAdminStatus:
-    TestUtil.killServers()
-    sys.exit(1)
-command = iceStormAdmin + TestUtil.clientOptions + iceStormReference + r' -e "destroy fed3"'
+command = iceStormAdmin + TestUtil.clientOptions + iceStormReference + r' -e "destroy fed1 fed2 fed3"'
 iceStormAdminPipe = os.popen(command)
 iceStormAdminStatus = iceStormAdminPipe.close()
 if iceStormAdminStatus: