[Cluster-devel] conga/luci/test CGA_0200_Create_cluster.py con ...

[ldimaggi at sourceware.org]

CVSROOT:	/cvs/cluster
Module name:	conga
Changes by:	ldimaggi at sourceware.org	2007-04-24 18:48:50

Modified files:
	luci/test      : CGA_0200_Create_cluster.py conga_Helpers.py 

Log message:
	Updated to reflect change in GUI

Patches:
http://sourceware.org/cgi-bin/cvsweb.cgi/conga/luci/test/CGA_0200_Create_cluster.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.15&r2=1.16

--- conga/luci/test/CGA_0200_Create_cluster.py	2007/04/24 14:25:53	1.5
+++ conga/luci/test/CGA_0200_Create_cluster.py	2007/04/24 17:48:50	1.6
@@ -90,7 +90,7 @@
         sel.click("link=Manage Systems")
         sel.wait_for_page_to_load(PAGE_DISPLAY_DELAY)
         self.assertTrue (sel.is_text_present('testCluster'))
-        self.assertTrue (sel.is_element_present("name=__CLUSTER:testCluster"))
+        self.assertTrue (sel.is_element_present("name=__CLUSTER:X___testCluster"))
         
         # Then - delete the cluster
         sel.click("link=homebase")
@@ -99,6 +99,10 @@
         sel.wait_for_page_to_load(PAGE_DISPLAY_DELAY)
         sel.select("cluster_action", "label=Delete this cluster")
         sel.click("//input[@value='Go']")
+    
+        self.assertEqual("Delete this cluster?", sel.get_confirmation())
+        time.sleep (60)
+
         sel.wait_for_page_to_load(PAGE_DISPLAY_DELAY)
         sel.click("link=homebase")
         sel.wait_for_page_to_load(PAGE_DISPLAY_DELAY)
@@ -113,16 +117,6 @@
             sel.wait_for_page_to_load(PAGE_DISPLAY_DELAY)
             self.assertTrue (sel.is_text_present('Removed storage system "' + systemName + '" successfully'))
 
-        # And the cluster reference in the storage system list too
-        sel.click("link=homebase")
-        sel.wait_for_page_to_load(PAGE_DISPLAY_DELAY)
-        sel.click("link=Manage Systems")
-        sel.wait_for_page_to_load(PAGE_DISPLAY_DELAY)
-        sel.click("__CLUSTER0")
-        sel.click("document.adminform.Submit")
-        sel.wait_for_page_to_load(PAGE_DISPLAY_DELAY)
-        self.assertEqual("Do you really want to remove the following managed systems:\nClusters:\n-testCluster", sel.get_confirmation())
-
         self.logger.info('Ending test case CGA_0200_Create_cluster.test_congaCluster')
 
     def tearDown(self):
--- conga/luci/test/conga_Helpers.py	2007/04/18 17:55:31	1.15
+++ conga/luci/test/conga_Helpers.py	2007/04/24 17:48:50	1.16
@@ -48,19 +48,22 @@
                          #'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'}
+#                         '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-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'}
+#                         'pogolinux-2.test.redhat.com':'foobar'
+}
 
 CONGA_LARGE_CLUSTER_SYSTEMS = {#'tng3-1.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'}
+#                         'pogolinux-2.test.redhat.com':'foobar'
+}
 
 CONGA_USERS =           {#'user1':'user1_password', 
                          #'user2':'user2_password',