Merge pull request #1742 from davebx/ttc_cleanup

Clean up some twilltestcase methods.

test/base/twilltestcase.py

@@ -1505,7 +1505,10 @@ def library_wait( self, library_id, cntrller='library_admin', maxiter=90 ):
                 break
         self.assertNotEqual(count, maxiter)
 
-    def login( self, email='test@bx.psu.edu', password='testuser', username='admin-user', redirect='' ):
+    def login( self, email='test@bx.psu.edu', password='testuser', username='admin-user', redirect='', logout_first=True ):
+        # Clear cookies.
+        if logout_first:
+            self.logout()
         # test@bx.psu.edu is configured as an admin user
         previously_created, username_taken, invalid_username = \
             self.create( email=email, password=password, username=username, redirect=redirect )
@@ -1519,6 +1522,7 @@ def login( self, email='test@bx.psu.edu', password='testuser', username='admin-u
     def logout( self ):
         self.visit_url( "%s/user/logout" % self.url )
         self.check_page_for_string( "You have been logged out" )
+        tc.browser.cj.clear()
 
     def make_accessible_via_link( self, history_id, strings_displayed=[], strings_displayed_after_submit=[] ):
         # twill barfs on this form, possibly because it contains no fields, but not sure.

test/functional/test_admin_features.py

@@ -31,17 +31,14 @@
 class TestDataSecurity( TwillTestCase ):
     def test_000_initiate_users( self ):
         """Ensuring all required user accounts exist"""
-        self.logout()
         self.login( email='test1@bx.psu.edu', username='regular-user1' )
         global regular_user1
         regular_user1 = get_user( 'test1@bx.psu.edu' )
         assert regular_user1 is not None, 'Problem retrieving user with email "test1@bx.psu.edu" from the database'
-        self.logout()
         self.login( email='test2@bx.psu.edu', username='regular-user2' )
         global regular_user2
         regular_user2 = get_user( 'test2@bx.psu.edu' )
         assert regular_user2 is not None, 'Problem retrieving user with email "test2@bx.psu.edu" from the database'
-        self.logout()
         self.login( email='test@bx.psu.edu', username='admin-user' )
         global admin_user
         admin_user = get_user( 'test@bx.psu.edu' )
@@ -110,7 +107,6 @@ def test_010_reset_password_as_admin( self ):
     def test_015_login_after_password_reset( self ):
         """Testing logging in after an admin reset a password - tests DefaultHistoryPermissions for accounts created by an admin"""
         # logged in as admin_user
-        self.logout()
         self.login( email=regular_user3.email, password='testreset' )
         # Make sure a History and HistoryDefaultPermissions exist for the user
         latest_history = get_latest_history_for_user( regular_user3 )
@@ -135,7 +131,6 @@ def test_015_login_after_password_reset( self ):
                                       % ( latest_dataset.id,
                                           latest_dataset.actions.action,
                                           galaxy.model.Dataset.permitted_actions.DATASET_MANAGE_PERMISSIONS.action ) )
-        self.logout()
         # Reset the password to the default for later tests
         self.login( email='test@bx.psu.edu' )
         self.reset_password_as_admin( user_id=self.security.encode_id( regular_user3.id ), password='testuser' )

test/functional/test_data_security.py

@@ -21,28 +21,24 @@ class TestDataSecurity( TwillTestCase ):
 
     def test_000_initiate_users( self ):
         """Ensuring all required user accounts exist"""
-        self.logout()
         self.login( email='test1@bx.psu.edu', username='regular-user1' )
         global regular_user1
         regular_user1 = get_user( 'test1@bx.psu.edu' )
         assert regular_user1 is not None, 'Problem retrieving user with email "test1@bx.psu.edu" from the database'
         global regular_user1_private_role
         regular_user1_private_role = get_private_role( regular_user1 )
-        self.logout()
         self.login( email='test2@bx.psu.edu', username='regular-user2' )
         global regular_user2
         regular_user2 = get_user( 'test2@bx.psu.edu' )
         assert regular_user2 is not None, 'Problem retrieving user with email "test2@bx.psu.edu" from the database'
         global regular_user2_private_role
         regular_user2_private_role = get_private_role( regular_user2 )
-        self.logout()
         self.login( email='test3@bx.psu.edu', username='regular-user3' )
         global regular_user3
         regular_user3 = get_user( 'test3@bx.psu.edu' )
         assert regular_user3 is not None, 'Problem retrieving user with email "test3@bx.psu.edu" from the database'
         global regular_user3_private_role
         regular_user3_private_role = get_private_role( regular_user3 )
-        self.logout()
         self.login( email='test@bx.psu.edu', username='admin-user' )
         global admin_user
         admin_user = get_user( 'test@bx.psu.edu' )
@@ -82,7 +78,6 @@ def test_005_default_permissions( self ):
     def test_010_private_role_creation_and_default_history_permissions( self ):
         """Testing private role creation and changing DefaultHistoryPermissions for new histories"""
         # Logged in as admin_user
-        self.logout()
         # Some of the history related tests here are similar to some tests in the
         # test_history_functions.py script, so we could potentially eliminate 1 or 2 of them.
         self.login( email='test1@bx.psu.edu' )
@@ -150,7 +145,6 @@ def test_010_private_role_creation_and_default_history_permissions( self ):
     def test_015_change_default_permissions_for_current_history( self ):
         """Testing changing DefaultHistoryPermissions for the current history"""
         # logged in a regular_user1
-        self.logout()
         self.login( email=regular_user2.email )
         latest_history = get_latest_history_for_user( regular_user2 )
         self.upload_file( '1.bed' )
@@ -191,7 +185,6 @@ def test_015_change_default_permissions_for_current_history( self ):
     def test_999_reset_data_for_later_test_runs( self ):
         """Reseting data to enable later test runs to pass"""
         # Logged in as regular_user2
-        self.logout()
         self.login( email=admin_user.email )
         ##################
         # Make sure all users are associated only with their private roles
@@ -203,13 +196,11 @@ def test_999_reset_data_for_later_test_runs( self ):
         #####################
         # Reset DefaultHistoryPermissions for regular_user1
         #####################
-        self.logout()
         self.login( email=regular_user1.email )
         # Change DefaultHistoryPermissions for regular_user1 back to the default
         permissions_in = [ 'DATASET_MANAGE_PERMISSIONS' ]
         permissions_out = [ 'DATASET_ACCESS' ]
         self.user_set_default_permissions( permissions_in=permissions_in,
                                            permissions_out=permissions_out,
                                            role_id=str( regular_user1_private_role.id ) )
-        self.logout()
         self.login( email=admin_user.email )

test/functional/test_dataset_features.py

@@ -6,7 +6,6 @@ class TestDatasetFeatures( TwillTestCase ):
 
     def test_0000_initiate_users( self ):
         """Ensuring all required user accounts exist"""
-        self.logout()
         self.login( email='test@bx.psu.edu', username='admin-user' )
         global admin_user
         admin_user = test_db_util.get_user( 'test@bx.psu.edu' )

test/functional/test_get_data.py

@@ -14,7 +14,6 @@ def test_0000_setup_upload_tests( self ):
         """
         Configuring upload tests, setting admin_user
         """
-        self.logout()
         self.login( email='test@bx.psu.edu' )
         global admin_user
         admin_user = get_user( email='test@bx.psu.edu' )
@@ -634,6 +633,3 @@ def test_0175_upload_file( self ):
         self.check_metadata_for_string( 'value="1.bigwig" value="\?" Change data type selected value="bigwig" selected="yes"' )
 
         self.delete_history( id=self.security.encode_id( history.id ) )
-
-    def test_9999_clean_up( self ):
-        self.logout()

test/functional/test_library_features.py

@@ -32,28 +32,24 @@ class TestLibraryFeatures( TwillTestCase ):
 
     def test_000_initiate_users( self ):
         """Ensuring all required user accounts exist"""
-        self.logout()
         self.login( email='test1@bx.psu.edu', username='regular-user1' )
         global regular_user1
         regular_user1 = get_user( 'test1@bx.psu.edu' )
         assert regular_user1 is not None, 'Problem retrieving user with email "test1@bx.psu.edu" from the database'
         global regular_user1_private_role
         regular_user1_private_role = get_private_role( regular_user1 )
-        self.logout()
         self.login( email='test2@bx.psu.edu', username='regular-user2' )
         global regular_user2
         regular_user2 = get_user( 'test2@bx.psu.edu' )
         assert regular_user2 is not None, 'Problem retrieving user with email "test2@bx.psu.edu" from the database'
         global regular_user2_private_role
         regular_user2_private_role = get_private_role( regular_user2 )
-        self.logout()
         self.login( email='test3@bx.psu.edu', username='regular-user3' )
         global regular_user3
         regular_user3 = get_user( 'test3@bx.psu.edu' )
         assert regular_user3 is not None, 'Problem retrieving user with email "test3@bx.psu.edu" from the database'
         global regular_user3_private_role
         regular_user3_private_role = get_private_role( regular_user3 )
-        self.logout()
         self.login( email='test@bx.psu.edu', username='admin-user' )
         global admin_user
         admin_user = get_user( 'test@bx.psu.edu' )
@@ -279,7 +275,6 @@ def test_070_upload_directory_of_files_from_libraries_view( self ):
                                   role_ids,
                                   permissions_in,
                                   permissions_out )
-        self.logout()
         # Now that we have permissions set on the library, we can proceed to test uploading files
         self.login( email=regular_user1.email )
         ldda_message = 'Uploaded all files in test-data/users/test1...'
@@ -293,7 +288,6 @@ def test_070_upload_directory_of_files_from_libraries_view( self ):
                                      server_dir=regular_user1.email,
                                      ldda_message=ldda_message,
                                      strings_displayed=[ "Upload a directory of files" ] )
-        self.logout()
         self.login( regular_user3.email )
         ldda_message = 'Uploaded all files in test-data/users/test3.../run1'
         # Since regular_user2 has a subdirectory contained within her configured user_library_import_dir,
@@ -309,7 +303,6 @@ def test_070_upload_directory_of_files_from_libraries_view( self ):
     def test_075_download_archive_of_library_files( self ):
         """Testing downloading an archive of files from library1"""
         # logged in as regular_user3
-        self.logout()
         self.login( email=admin_user.email )
         filename = '1.bed'
         self.upload_library_dataset( cntrller='library_admin',
@@ -626,4 +619,3 @@ def test_999_reset_data_for_later_test_runs( self ):
             refresh( user )
             if len( user.roles) != 1:
                 raise AssertionError( '%d UserRoleAssociations are associated with %s ( should be 1 )' % ( len( user.roles ), user.email ) )
-        self.logout()