[Cluster-devel] conga/luci/test CGA_0160_Add_User.py conga_sui ...

[Cluster-devel] conga/luci/test CGA_0160_Add_User.py conga_sui ...

[ldimaggi]

CVSROOT:	/cvs/cluster
Module name:	conga
Changes by:	ldimaggi at sourceware.org	2007-02-20 21:46:44

Modified files:
	luci/test      : CGA_0160_Add_User.py conga_suite.py 

Log message:
	Minot cleanup only

Patches:
http://sourceware.org/cgi-bin/cvsweb.cgi/conga/luci/test/CGA_0160_Add_User.py.diff?cvsroot=cluster&r1=1.6&r2=1.7
http://sourceware.org/cgi-bin/cvsweb.cgi/conga/luci/test/conga_suite.py.diff?cvsroot=cluster&r1=1.10&r2=1.11

--- conga/luci/test/CGA_0160_Add_User.py	2007/02/09 03:23:17	1.6
+++ conga/luci/test/CGA_0160_Add_User.py	2007/02/20 21:46:44	1.7
@@ -140,7 +140,7 @@
                     #print "DEBUG - loggedInUser=" + loggedInUser + " userName=" + userName
                     if (loggedInUser == userName):
                         # Validation 1 - seeing authorized systems
-                        print 'Verify user ' + userName + ' is able to access authorized systems'
+                        self.logger.info('Verify user ' + userName + ' is able to access authorized systems')
                         self.assertTrue (sel.is_text_present(CONGA_USERS_SYSTEMS[loggedInUser]))
                                                
                         sel.click("link=" + CONGA_USERS_SYSTEMS[loggedInUser])
@@ -157,13 +157,13 @@
                                 self.assertTrue (sel.is_text_present('hda'))
                                 break
                             except:
-                                print 'Failed to view hard disk - assume slow reponse - trying again'
+                                self.logger.info('Failed to view hard disk - assume slow reponse - trying again')
                             loopCounter = loopCounter +1    
                             time.sleep (30)
                         
                     else:
                         # Validation 2 - not seeing other systems
-                        print 'Verify user ' + loggedInUser + ' is not able to access unauthorized system ' + CONGA_USERS_SYSTEMS[userName]
+                        self.logger.info('Verify user ' + loggedInUser + ' is not able to access unauthorized system ' + CONGA_USERS_SYSTEMS[userName])
                         self.assertFalse (sel.is_text_present(CONGA_USERS_SYSTEMS[userName]))
                         
             logout(self.selenium)  
--- conga/luci/test/conga_suite.py	2007/02/20 20:18:25	1.10
+++ conga/luci/test/conga_suite.py	2007/02/20 21:46:44	1.11
@@ -67,9 +67,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(congaDemoSuite)
+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