From mboxrd@z Thu Jan  1 00:00:00 1970
From: ldimaggi@sourceware.org <ldimaggi@sourceware.org>
Date: 13 Dec 2006 20:13:34 -0000
Subject: [Cluster-devel] conga/luci/test congaDemoTests.py conga_Helper ...
Message-ID: <20061213201334.22994.qmail@sourceware.org>
List-Id: <cluster-devel.redhat.com>
To: cluster-devel.redhat.com
MIME-Version: 1.0
Content-Type: text/plain; charset="us-ascii"
Content-Transfer-Encoding: 7bit

CVSROOT:	/cvs/cluster
Module name:	conga
Changes by:	ldimaggi at sourceware.org	2006-12-13 20:13:33

Modified files:
	luci/test      : congaDemoTests.py conga_Helpers.py 
	                 conga_suite.py 

Log message:
	Added cluster test to suite file.

Patches:
http://sourceware.org/cgi-bin/cvsweb.cgi/conga/luci/test/congaDemoTests.py.diff?cvsroot=cluster&r1=1.5&r2=1.6
http://sourceware.org/cgi-bin/cvsweb.cgi/conga/luci/test/conga_Helpers.py.diff?cvsroot=cluster&r1=1.7&r2=1.8
http://sourceware.org/cgi-bin/cvsweb.cgi/conga/luci/test/conga_suite.py.diff?cvsroot=cluster&r1=1.5&r2=1.6

--- conga/luci/test/congaDemoTests.py	2006/12/06 18:58:09	1.5
+++ conga/luci/test/congaDemoTests.py	2006/12/13 20:13:33	1.6
@@ -160,7 +160,7 @@
         suite = unittest.TestSuite()
         suite.addTest(congaDemoTests('test_congaStorage'))
         suite.addTest(congaDemoTests('test_congaUsers'))
-        #suite.addTest(congaDemoTests('test_congaCluster'))
+        suite.addTest(congaDemoTests('test_congaCluster'))
         return suite
 
 if __name__ == "__main__":
--- conga/luci/test/conga_Helpers.py	2006/12/11 21:37:22	1.7
+++ conga/luci/test/conga_Helpers.py	2006/12/13 20:13:33	1.8
@@ -44,7 +44,7 @@
 CONGA_STORAGE_SYSTEMS = {'tng3-1.lab.msp.redhat.com':'password', 
 #                         'tng3-2.lab.msp.redhat.com':'password',
                          'tng3-3.lab.msp.redhat.com':'password',
-                         'tng3-4.lab.msp.redhat.com':'password',
+#                         'tng3-4.lab.msp.redhat.com':'password',
                          'tng3-5.lab.msp.redhat.com':'password'}
 
 #CONGA_STORAGE_SYSTEMS = {'tng3-2.lab.msp.redhat.com':'password', 
@@ -71,14 +71,14 @@
                          'user10':'user10_password'}
 
 CONGA_USERS_SYSTEMS =   {'user1':'tng3-1.lab.msp.redhat.com', 
-                         'user2':'tng3-2.lab.msp.redhat.com', 
+#                         'user2':'tng3-2.lab.msp.redhat.com', 
                          'user3':'tng3-3.lab.msp.redhat.com', 
-                         'user4':'tng3-4.lab.msp.redhat.com', 
+#                         'user4':'tng3-4.lab.msp.redhat.com', 
                          'user5':'tng3-5.lab.msp.redhat.com', 
                          'user6':'tng3-1.lab.msp.redhat.com', 
-                         'user7':'tng3-2.lab.msp.redhat.com', 
+#                         'user7':'tng3-2.lab.msp.redhat.com', 
                          'user8':'tng3-3.lab.msp.redhat.com', 
-                         'user9':'tng3-4.lab.msp.redhat.com', 
+#                         'user9':'tng3-4.lab.msp.redhat.com', 
                          'user10':'tng3-5.lab.msp.redhat.com'}
    
 # Data used to verify the on-line help contents. The Dictionary contains
--- conga/luci/test/conga_suite.py	2006/12/11 21:37:22	1.5
+++ conga/luci/test/conga_suite.py	2006/12/13 20:13:33	1.6
@@ -31,7 +31,8 @@
 import unittest
 import congaDemoTests
 import CGA_0160_Add_User
-import GA_0170_Online_Documentation_Portlet
+import CGA_0170_Online_Documentation_Portlet
+import CGA_0200_Create_cluster
 
 # Tests planned - all not yet complete:   
 #   CGA-0160_Add_User.py
@@ -61,12 +62,14 @@
 congaDemoSuite = congaDemoTests.suite()
 CGA_0160_Add_UserSuite = CGA_0160_Add_User.suite()
 CGA_0170_Online_Documentation_Portlet_Suite = GA_0170_Online_Documentation_Portlet.suite()
+CGA_0200_Create_cluster_Suite = CGA_0200_Create_cluster.suite()
 
 # Assemble the suite
 suite = unittest.TestSuite()
-#suite.addTest(congaDemoSuite)
+suite.addTest(congaDemoSuite)
 suite.addTest(CGA_0160_Add_UserSuite)
-#suite.addTest(CGA_0170_Online_Documentation_Portlet_Suite)
+suite.addTest(CGA_0170_Online_Documentation_Portlet_Suite)
+suite.addTest(CGA_0200_Create_cluster_Suite)
 
 # Run the test suite
 unittest.TextTestRunner(verbosity=2).run(suite)