From mboxrd@z Thu Jan 1 00:00:00 1970 From: rmccabe@sourceware.org Date: 25 Jun 2007 16:17:28 -0000 Subject: [Cluster-devel] conga ./conga.spec.in.in luci/test/cleaner.py ... Message-ID: <20070625161728.29197.qmail@sourceware.org> List-Id: 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 Branch: RHEL5 Changes by: rmccabe at sourceware.org 2007-06-25 16:17:27 Modified files: . : conga.spec.in.in luci/test : cleaner.py congaDemoTests.py conga_Helpers.py conga_suite.py Log message: Update to the latest revisions of the test suite Patches: http://sourceware.org/cgi-bin/cvsweb.cgi/conga/conga.spec.in.in.diff?cvsroot=cluster&only_with_tag=RHEL5&r1=1.45.2.39&r2=1.45.2.40 http://sourceware.org/cgi-bin/cvsweb.cgi/conga/luci/test/cleaner.py.diff?cvsroot=cluster&only_with_tag=RHEL5&r1=1.1.4.1&r2=1.1.4.2 http://sourceware.org/cgi-bin/cvsweb.cgi/conga/luci/test/congaDemoTests.py.diff?cvsroot=cluster&only_with_tag=RHEL5&r1=1.11.2.1&r2=1.11.2.2 http://sourceware.org/cgi-bin/cvsweb.cgi/conga/luci/test/conga_Helpers.py.diff?cvsroot=cluster&only_with_tag=RHEL5&r1=1.14.2.1&r2=1.14.2.2 http://sourceware.org/cgi-bin/cvsweb.cgi/conga/luci/test/conga_suite.py.diff?cvsroot=cluster&only_with_tag=RHEL5&r1=1.11.2.1&r2=1.11.2.2 --- conga/conga.spec.in.in 2007/06/19 19:50:47 1.45.2.39 +++ conga/conga.spec.in.in 2007/06/25 16:17:27 1.45.2.40 @@ -306,9 +306,11 @@ - Fixed bz243701 (ricci init script can exit with non-LSB-compliant return codes) - Fixed bz244146 (Add port number to message when ricci is not started/firewalled on cluster nodes.) - Fixed bz244878 (Successful login results in an infinite redirection loop with MSIE) +- Fixed bz239388 (conga storage: default VG creation should be clustered if a cluster node) - Resolves: bz238655, bz221899, bz225782, bz227682, bz227743, bz239389, - Resolves: bz239596, bz240034, bz240361, bz241415, bz241418, bz241706, -- Resolves: bz241727, bz242668, bz243701, bz244146, bz244878, bz238726 +- Resolves: bz241727, bz242668, bz243701, bz244146, bz244878, bz238726, +- Resolves: bz239388 * Wed Apr 11 2007 Ryan McCabe 0.9.2-5 - Fixed bz225206 (Cluster cannot be deleted (from 'Manage Systems') - but no error results) --- conga/luci/test/cleaner.py 2007/03/01 00:31:19 1.1.4.1 +++ conga/luci/test/cleaner.py 2007/06/25 16:17:27 1.1.4.2 @@ -32,15 +32,6 @@ sel.wait_for_page_to_load(PAGE_DISPLAY_DELAY) sel.click("link=cluster") sel.wait_for_page_to_load(PAGE_DISPLAY_DELAY) - - ##################### - - - junk = sel.get_text("cluster_action") - print junk - print sel.get_body_text() - print '=============================' - tempBool = sel.is_element_present("cluster_action") if (tempBool == True): --- conga/luci/test/congaDemoTests.py 2007/03/01 00:31:19 1.11.2.1 +++ conga/luci/test/congaDemoTests.py 2007/06/25 16:17:27 1.11.2.2 @@ -38,8 +38,8 @@ def setUp(self): - temp = cleaner() - temp.cleanup() + #temp = cleaner() + #temp.cleanup() # Set up logging self.theloggerObject = setupLogger (CONGA_DEBUG_LOG) @@ -113,7 +113,7 @@ def suite(): suite = unittest.TestSuite() -# suite.addTest(congaDemoTests('test_congaStorage')) + suite.addTest(congaDemoTests('test_congaStorage')) suite.addTest(congaDemoTests('test_congaUsers')) return suite --- conga/luci/test/conga_Helpers.py 2007/03/01 00:31:19 1.14.2.1 +++ conga/luci/test/conga_Helpers.py 2007/06/25 16:17:27 1.14.2.2 @@ -36,8 +36,8 @@ # Define data to support tests - global for now CONGA_ADMIN_USERNAME = 'admin' -CONGA_ADMIN_PASSWORD = 'password' -CONGA_SERVER = 'http://tng3-5.lab.msp.redhat.com:8080' +CONGA_ADMIN_PASSWORD = 'foobar' +CONGA_SERVER = 'http://dell-pe1650-2.test.redhat.com:8080' PAGE_DISPLAY_DELAY = '60000' CONGA_LOG = '/var/tmp/congaTest.log' CONGA_DEBUG_LOG = '/var/tmp/congaTest_debug.log' @@ -46,20 +46,24 @@ 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-5.lab.msp.redhat.com':'password'} + 'dell-pe1950-1.test.redhat.com':'foobar', + 'pogolinux-1.test.redhat.com':'foobar', +# 'pogolinux-2.test.redhat.com':'foobar' +} CONGA_SMALL_CLUSTER_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-2.lab.msp.redhat.com':'password', + 'dell-pe1950-1.test.redhat.com':'foobar', + 'pogolinux-1.test.redhat.com':'foobar', +# 'pogolinux-2.test.redhat.com':'foobar' +} CONGA_LARGE_CLUSTER_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-5.lab.msp.redhat.com':'password'} + 'dell-pe1950-1.test.redhat.com':'foobar', + 'pogolinux-1.test.redhat.com':'foobar', +# 'pogolinux-2.test.redhat.com':'foobar' +} CONGA_USERS = {#'user1':'user1_password', #'user2':'user2_password', @@ -74,9 +78,9 @@ CONGA_USERS_SYSTEMS = {#'user1':'tng3-1.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', - 'user5':'tng3-5.lab.msp.redhat.com' + 'user3':'dell-pe1950-1.test.redhat.com', + 'user4':'pogolinux-1.test.redhat.com', + 'user5':'pogolinux-2.test.redhat.com' } # Data used to verify the on-line help contents. The Dictionary contains @@ -88,12 +92,12 @@ 'Cluster Tab', 'Storage Tab'] -HELP_DICTIONARY = {'Conga User Manual':77, - 'Introduction':200, - 'Conga Architecture':225, - 'Homebase Tab':4257, - 'Cluster Tab':12280, - 'Storage Tab':23833 } +HELP_DICTIONARY = {'Conga User Manual':81, + 'Introduction':204, + 'Conga Architecture':229, + 'Homebase Tab':4261, + 'Cluster Tab':12284, + 'Storage Tab':23837 } def createStorageSystem(sel, systemName, systemPassword, theLogger): """Common code to create storage systems""" @@ -111,6 +115,10 @@ theLogger.debug('Delete storage system: ' + systemName) # Need to handle artifacts names - underscores in strings, not periods systemNameMod = systemName.replace('.', '_') + + # Added 20070418 - ldimaggi - to keep up with changes to GUI + systemNameMod = "X___" + systemNameMod + sel.click("name=__SYSTEM:" + systemNameMod) sel.click("document.adminform.Submit") sel.wait_for_page_to_load(PAGE_DISPLAY_DELAY) --- conga/luci/test/conga_suite.py 2007/03/01 00:31:19 1.11.2.1 +++ conga/luci/test/conga_suite.py 2007/06/25 16:17:27 1.11.2.2 @@ -68,9 +68,9 @@ # Assemble the suite suite = unittest.TestSuite() suite.addTest(congaDemoSuite) -suite.addTest(CGA_0160_Add_UserSuite) -suite.addTest(CGA_0170_Online_Documentation_Portlet_Suite) -suite.addTest(CGA_0200_Create_cluster_Suite) +#suite.addTest(CGA_0160_Add_UserSuite) +#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)