Don't hold up broker initialization for cluster initialization.

git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk/qpid@896536 13f79535-47bb-0310-9956-ffa450edef68

1 files changed, 16 insertions, 9 deletions

diff --git a/cpp/src/tests/cluster_tests.py b/cpp/src/tests/cluster_tests.py
index 178271e977..4bfbca415a 100755
--- a/cpp/src/tests/cluster_tests.py
+++ b/cpp/src/tests/cluster_tests.py
@@ -193,7 +193,8 @@ class StoreTests(BrokerTest):
         a.terminate()
         cluster2 = self.cluster(1, args=self.args())
         try:
-            a = cluster2.start("a", expect=EXPECT_EXIT_FAIL)
+            a = cluster2.start("a", expect=EXPECT_EXIT_OK)
+            a.ready()
             self.fail("Expected exception")
         except: pass
 
@@ -214,8 +215,10 @@ class StoreTests(BrokerTest):
         self.assertEqual(c.wait(), 0)
 
         # Mix members from both shutdown events, they should fail
-        a = cluster.start("a", expect=EXPECT_EXIT_FAIL, wait=False)
-        b = cluster.start("b", expect=EXPECT_EXIT_FAIL, wait=False)
+        a = cluster.start("a", expect=EXPECT_EXIT_OK, wait=False)
+        b = cluster.start("b", expect=EXPECT_EXIT_OK, wait=False)
+        self.assertRaises(Exception, lambda: a.ready())
+        self.assertRaises(Exception, lambda: b.ready())
 
     def test_total_failure(self):
         # Verify we abort with sutiable error message if no clean stores.
@@ -224,10 +227,14 @@ class StoreTests(BrokerTest):
         b = cluster.start("b", expect=EXPECT_EXIT_FAIL, wait=True)
         a.kill()
         b.kill()
-        a = cluster.start("a", expect=EXPECT_EXIT_FAIL, wait=False)
-        b = cluster.start("b", expect=EXPECT_EXIT_FAIL, wait=False)
-        assert a.wait() != 0
-        assert b.wait() != 0
+        a = cluster.start("a", expect=EXPECT_EXIT_OK, wait=False)
+        b = cluster.start("b", expect=EXPECT_EXIT_OK, wait=False)
+        self.assertRaises(Exception, lambda: a.ready())
+        self.assertRaises(Exception, lambda: b.ready())
         msg = re.compile("critical.*no clean store")
-        assert msg.search(file(a.log).read())
-        assert msg.search(file(b.log).read())
+        assert a.search_log(msg)
+        assert b.search_log(msg)
+        # FIXME aconway 2009-12-03: verify correct store ID in log message
+        # FIXME aconway 2009-12-03: verify manual restore procedure
+
+