diff options
| author | Kim van der Riet <kpvdr@apache.org> | 2009-06-10 18:54:30 +0000 |
|---|---|---|
| committer | Kim van der Riet <kpvdr@apache.org> | 2009-06-10 18:54:30 +0000 |
| commit | 4a8d2bdc6a029fd176abbc2ecb505ffe100f92fd (patch) | |
| tree | 53a495a2f5d6315c6c35ffcdae389c174fefd569 /cpp/src/tests/cluster.py | |
| parent | 30eec8fc1f8ba0b256b4a5e3cb4c16c3f2d7fbff (diff) | |
| download | qpid-python-4a8d2bdc6a029fd176abbc2ecb505ffe100f92fd.tar.gz | |
Updates to python cluster tests and associated scripts
git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk/qpid@783451 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'cpp/src/tests/cluster.py')
| -rwxr-xr-x | cpp/src/tests/cluster.py | 15 |
1 files changed, 8 insertions, 7 deletions
diff --git a/cpp/src/tests/cluster.py b/cpp/src/tests/cluster.py index ae4cc7aa85..a9082dddd9 100755 --- a/cpp/src/tests/cluster.py +++ b/cpp/src/tests/cluster.py @@ -43,7 +43,7 @@ class ClusterTests(TestBaseCluster): self.checkNumBrokers(25) self.killCluster("cluster-02.2") self.checkNumBrokers(20) - self.stopCheckAll() + self.stopAllCheck() except: self.killAllClusters(True) raise @@ -53,17 +53,17 @@ class ClusterTests(TestBaseCluster): try: clusterName = "cluster-03" self.createCheckCluster(clusterName, 3) - for i in range(4,9): + for i in range(3,8): self.createClusterNode(i, clusterName) self.checkNumClusterBrokers(clusterName, 8) self.killNode(2, clusterName) self.killNode(5, clusterName) self.killNode(6, clusterName) self.checkNumClusterBrokers(clusterName, 5) + self.createClusterNode(8, clusterName) self.createClusterNode(9, clusterName) - self.createClusterNode(10, clusterName) self.checkNumClusterBrokers(clusterName, 7) - self.stopCheckAll() + self.stopAllCheck() except: self.killAllClusters(True) raise @@ -90,7 +90,7 @@ class ClusterTests(TestBaseCluster): self.createClusterNode(3, clusterName) self.createClusterNode(4, clusterName) self.checkNumClusterBrokers(clusterName, 6) - self.stopCheckAll() + self.stopAllCheck() except: self.killAllClusters(True) raise @@ -102,7 +102,7 @@ class ClusterTests(TestBaseCluster): self.createCheckCluster(clusterName, 6) self.killClusterCheck(clusterName) self.createCheckCluster(clusterName, 6) - self.stopCheckAll() + self.stopAllCheck() except: self.killAllClusters(True) raise @@ -245,6 +245,7 @@ class ClusterTests(TestBaseCluster): dh.sendMsgs(20, 5) # 60 30 * dh.receiveMsgs(20, 4) # 60 50 * dh.killCluster() # cluster does not exist + self.checkNumClusterBrokers("cluster-12", 0) dh.restoreCluster() # 60 50 . . . . . . dh.restoreNodes() # 0 1 2 3 4 5 dh.finalizeTest() @@ -325,7 +326,7 @@ class ClusterTests(TestBaseCluster): # Start the test here if __name__ == '__main__': - if os.getenv("STORE_ENABLE") != None: + if os.getenv("STORE_LIB") != None: print "NOTE: Store enabled for the following tests:" if not unittest.main(): sys.exit(1) |