[rhmessaging-commits] rhmessaging commits: r3426 - store/trunk/cpp/tests/python_tests.

[rhmessaging-commits at lists.jboss.org]

Author: kpvdr
Date: 2009-06-05 15:50:53 -0400 (Fri, 05 Jun 2009)
New Revision: 3426

Removed:
   store/trunk/cpp/tests/python_tests/cluster_basic.py
Modified:
   store/trunk/cpp/tests/python_tests/__init__.py
Log:
Removed cluster python test in favor of using the qpid test as an installable test which can use persistence if the correct environment exists.

Modified: store/trunk/cpp/tests/python_tests/__init__.py
===================================================================
--- store/trunk/cpp/tests/python_tests/__init__.py	2009-06-05 19:35:41 UTC (rev 3425)
+++ store/trunk/cpp/tests/python_tests/__init__.py	2009-06-05 19:50:53 UTC (rev 3426)
@@ -21,5 +21,4 @@
 #
 # The GNU Lesser General Public License is available in the file COPYING.
 
-from cluster_basic import *
 from flow_to_disk import *

Deleted: store/trunk/cpp/tests/python_tests/cluster_basic.py
===================================================================
--- store/trunk/cpp/tests/python_tests/cluster_basic.py	2009-06-05 19:35:41 UTC (rev 3425)
+++ store/trunk/cpp/tests/python_tests/cluster_basic.py	2009-06-05 19:50:53 UTC (rev 3426)
@@ -1,110 +0,0 @@
-# Copyright (c) 2009 Red Hat, Inc.
-#
-# This file is part of the Qpid async store library msgstore.so.
-#
-# This library is free software; you can redistribute it and/or
-# modify it under the terms of the GNU Lesser General Public
-# License as published by the Free Software Foundation; either
-# version 2.1 of the License, or (at your option) any later version.
-#
-# This library is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-# Lesser General Public License for more details.
-#
-# You should have received a copy of the GNU Lesser General Public
-# License along with this library; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301
-# USA
-#
-# The GNU Lesser General Public License is available in the file COPYING.
-
-import os
-import signal
-from qpid.testlib import TestBaseCluster
-
-class BasicClusterTests(TestBaseCluster):
-    """Basic cluster with async store tests"""
-    
-    _runClusterTests = os.getenv("RUN_CLUSTER_TESTS")
-    
-    def test_Cluster_01_SingleClusterInitialization(self):
-        if self._runClusterTests == None:
-            print "skipped"
-            return
-        try:
-            clusterName = "test_Cluster_01_SingleClusterInitialization"
-            self.createCheckCluster(clusterName, 5)
-            self.checkNumBrokers(5)
-            self.stopCheckCluster(clusterName)
-        except:
-            self.killAllClusters()
-            raise
-
-    def test_Cluster_02_MultipleClusterInitialization(self):
-        if self._runClusterTests == None:
-            print "skipped"
-            return
-        try:
-            for i in range(0, 5):
-                clusterName = "test_Cluster_02_MultipleClusterInitialization.%d" % i
-                self.createCluster(clusterName, 5)
-            self.checkNumBrokers(25)
-            self.killCluster("test_Cluster_02_MultipleClusterInitialization.2")
-            self.checkNumBrokers(20)
-            self.stopCheckAll()
-        except:
-            self.killAllClusters()
-            raise
-        
-    def test_Cluster_03_SingleClusterAddRemoveNodes(self):
-        if self._runClusterTests == None:
-            print "skipped"
-            return
-        try:
-            clusterName = "test_Cluster_03_SingleClusterAddRemoveNodes"
-            self.createCheckCluster(clusterName, 3)
-            for i in range(4,9):
-                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(9, clusterName)
-            self.createClusterNode(10, clusterName)
-            self.checkNumClusterBrokers(clusterName, 7)
-            self.stopCheckAll()
-        except:
-            self.killAllClusters()
-            raise
-
-    def test_Cluster_04_SingleClusterRemoveRestoreNodes(self):
-        if self._runClusterTests == None:
-            print "skipped"
-            return
-        try:
-            clusterName = "test_Cluster_04_SingleClusterRemoveRestoreNodes"
-            self.createCheckCluster(clusterName, 6)
-            self.checkNumBrokers(6)
-            self.killNode(1, clusterName)
-            self.killNode(3, clusterName)
-            self.killNode(4, clusterName)
-            self.checkNumBrokers(3)
-            self.createClusterNode(1, clusterName)
-            self.createClusterNode(3, clusterName)
-            self.createClusterNode(4, clusterName)
-            self.checkNumClusterBrokers(clusterName, 6)
-            self.killNode(2, clusterName)
-            self.killNode(3, clusterName)
-            self.killNode(4, clusterName)
-            self.checkNumBrokers(3)
-            self.createClusterNode(2, clusterName)
-            self.createClusterNode(3, clusterName)
-            self.createClusterNode(4, clusterName)
-            self.checkNumClusterBrokers(clusterName, 6)
-            self.stopCheckAll()
-        except:
-            self.killAllClusters()
-            raise
-