opensource/galaxy
3
0
Fork 0
mirror of https://github.com/galaxyproject/galaxy.git synced 2026-09-24 16:30:27 +08:00
Code Issues Packages Projects Releases Wiki Activity

Fixes and new functional tests for dataset security and libraries - now should be able to have multiple test runs without purging the database.

Browse Source
This commit is contained in:
Greg Von Kuster
2008-12-01 16:40:11 -05:00
parent 2dd60568fc
commit ca43dadc1b
5 changed files with 104 additions and 41 deletions
Download Patch File Download Diff File Expand all files Collapse all files
lib/galaxy/web/controllers/admin.py
+2 -3
View File
@@ -44,9 +44,8 @@ class Admin( BaseController ):
msg = params.msg
messagetype = params.get( 'messagetype', 'done' )
return trans.fill_template( '/admin/dataset_security/roles.mako',
roles=trans.app.model.Role.query() \
.filter( trans.app.model.Role.table.c.type != trans.app.model.Role.types.PRIVATE ) \
.order_by( trans.app.model.Role.table.c.name ).all(),
roles=trans.app.model.Role.filter( trans.app.model.Role.table.c.type != trans.app.model.Role.types.PRIVATE ) \
.order_by( trans.app.model.Role.table.c.name ).all(),
msg=msg,
messagetype=messagetype )
@web.expose
templates/admin/dataset_security/role.mako
+1 -1
View File
@@ -76,7 +76,7 @@ $().ready(function() {
</div>
</div>
<div class="form-row">
<input type="submit" name="role_button" value="Save"/>
<input type="submit" name="role_members_edit_button" value="Save"/>
</div>
</form>
</div>
templates/admin/dataset_security/roles.mako
-4
View File
@@ -1,10 +1,6 @@
<%inherit file="/base.mako"/>
<%namespace file="/message.mako" import="render_msg" />
<%
import galaxy.model
%>
## Render a row
<%def name="render_row( role, ctr, anchored, curr_anchor )">
%if ctr % 2 == 1:
test/base/twilltestcase.py
+34 -9
View File
@@ -381,6 +381,7 @@ class TwillTestCase( unittest.TestCase ):
for pi in permissions_in:
key = '%s_in' % pi
url ="%s&%s=%s" % ( url, key, str( role_id ) )
self.home()
self.visit_url( "%s/%s" % ( self.url, url ) )
self.last_page()
self.check_page_for_string( 'Default new history permissions have been changed.' )
@@ -397,6 +398,7 @@ class TwillTestCase( unittest.TestCase ):
for pi in permissions_in:
key = '%s_in' % pi
url ="%s&%s=%s" % ( url, key, str( role_id ) )
self.home()
self.visit_url( "%s/%s" % ( self.url, url ) )
self.last_page()
self.check_page_for_string( 'Default history permissions have been changed.' )
@@ -587,8 +589,15 @@ class TwillTestCase( unittest.TestCase ):
self.visit_url( "%s/admin/create_new_user?email=%s&password=%s&confirm=%s&user_create_button=%s" \
% ( self.url, email, password, password, 'Create' ) )
self.last_page()
self.check_page_for_string( "Created new user account" )
try:
self.check_page_for_string( "Created new user account" )
previously_created = False
except:
# May have created the account in a previous test run...
self.check_page_for_string( "User with that email already exists" )
previously_created = True
self.home()
return previously_created
def reset_password_as_admin( self, user_id=4, password='testreset' ):
"""Reset a user password"""
self.visit_url( "%s/admin/reset_user_password?user_id=%s" % ( self.url, str( user_id ) ) )
@@ -638,6 +647,7 @@ class TwillTestCase( unittest.TestCase ):
self.last_page()
check_str = 'The new role has been created with %d associated users and %d associated groups' % ( len( user_ids ), len( group_ids ) )
self.check_page_for_string( check_str )
previously_created = False
if private_role:
# Make sure no private roles are displayed
try:
@@ -648,13 +658,14 @@ class TwillTestCase( unittest.TestCase ):
# Reaching here is the behavior we want since no private roles should be displayed
pass
except AssertionError, err:
self.home()
errmsg = 'Exception caught attempting to create role: %s' % str( err )
raise AssertionError( errmsg )
# The role may have been created on a previous test run
self.check_page_for_string( "A role with that name already exists" )
previously_created = True
self.home()
self.visit_page( "admin/roles" )
self.check_page_for_string( description )
self.home()
return previously_created
def mark_role_deleted( self, role_id ):
"""Mark a role as deleted"""
self.visit_url( "%s/admin/mark_role_deleted?role_id=%s" % ( self.url, role_id ) )
@@ -700,14 +711,17 @@ class TwillTestCase( unittest.TestCase ):
for role_id in role_ids:
tc.fv( "1", "roles", role_id )
tc.submit( "create_group_button" )
except AssertionError, err:
self.home()
errmsg = 'Exception caught attempting to create group: %s' % str( err )
raise AssertionError( errmsg )
self.last_page()
self.check_page_for_string( "The new group has been created" )
previously_created = False
except:
self.check_page_for_string( "A group with that name already exists" )
previously_created = True
self.home()
self.visit_page( "admin/groups" )
self.check_page_for_string( name )
self.home()
return previously_created
def add_group_members( self, group_id, user_ids=[] ):
"""Add a member to an existing group"""
self.visit_url( "%s/admin/group_members_edit?group_id=%s" % ( self.url, group_id ) )
@@ -730,7 +744,18 @@ class TwillTestCase( unittest.TestCase ):
for group_name in group_names:
tc.fv( "1", "out_groups", group_name ) # note the buttons...
tc.submit( "groups_add_button" )
tc.submit( "role_button" )
tc.submit( "role_members_edit_button" )
self.home()
def associate_users_with_role( self, role_id, user_emails=[] ):
"""Add a users to an existing role"""
# NOTE: To get this to work with twill, all select lists must contain at least 1 option value
# before tc.submit or twill throws an exception, which is: ParseError: OPTION outside of SELECT
self.visit_url( "%s/admin/role?role_id=%s" % ( self.url, role_id ) )
self.check_page_for_string( 'Users associated with' )
for user_email in user_emails:
tc.fv( "1", "out_users", user_email )
tc.submit( "users_add_button" )
tc.submit( "role_members_edit_button" )
self.home()
def mark_group_deleted( self, group_id ):
"""Mark a group as deleted"""
test/functional/test_security_and_libraries.py
+67 -24
View File
@@ -139,7 +139,7 @@ class TestSecurityAndLibraries( TwillTestCase ):
adras.append( adra.action )
# Sort actions for later comparison
adras.sort()
# Compare ActionDatasetRoleAssociations with permissions_in - shouuld be the same
# Compare ActionDatasetRoleAssociations with permissions_in - should be the same
if adras != actions_in:
raise AssertionError( 'ActionDatasetRoleAssociations "%s" for dataset id %d differ from changed default permissions "%s"' \
% ( str( adras ), latest_dataset.id, str( actions_in ) ) )
@@ -147,6 +147,11 @@ class TestSecurityAndLibraries( TwillTestCase ):
if adras != dhps:
raise AssertionError( 'ActionDatasetRoleAssociations "%s" for dataset id %d differ from DefaultHistoryPermissions "%s" for history id %d' \
% ( str( adras ), latest_dataset.id, str( dhps ), latest_history.id ) )
# Change DefaultHistoryPermissions for testuser2 back to the default
permissions_in = [ 'DATASET_MANAGE_PERMISSIONS' ]
permissions_out = [ 'DATASET_ACCESS', 'DATASET_EDIT_METADATA' ]
role_id = str( private_role.id )
self.user_set_default_permissions( permissions_in=permissions_in, permissions_out=permissions_out, role_id=role_id )
self.home()
self.logout()
def test_09_login_as_non_admin_user2( self ):
@@ -206,7 +211,7 @@ class TestSecurityAndLibraries( TwillTestCase ):
self.login( email='test@bx.psu.edu' )
email = 'test4@bx.psu.edu'
password = 'testuser'
self.create_new_account_as_admin( email=email, password=password )
previously_created = self.create_new_account_as_admin( email=email, password=password )
# Get the user object for later tests
global testuser4
testuser4 = galaxy.model.User.filter( galaxy.model.User.table.c.email=='test4@bx.psu.edu' ).first()
@@ -216,21 +221,23 @@ class TestSecurityAndLibraries( TwillTestCase ):
# Make sure a private role was created for the user
if not testuser4.roles:
raise AssertionError( 'No UserRoleAssociations were created for user %s when the admin created the account' % email )
if len( testuser4.roles ) != 1:
raise AssertionError( '%d UserRoleAssociations were created for user %s when the admin created the account ( should have been 1 )' \
% len( testuser4.roles ) )
if not previously_created and len( testuser4.roles ) != 1:
raise AssertionError( '%d UserRoleAssociations were created for user %s when the admin created the account ( should have been <= 2 )' \
% ( len( testuser4.roles ), testuser4.email ) )
for ura in testuser4.roles:
role = galaxy.model.Role.get( ura.role_id )
if role.type != 'private':
if not previously_created and role.type != 'private':
raise AssertionError( 'Role created for user %s when the admin created the account is not private, type is' \
% str( role.type ) )
# Make sure a history was not created
histories = galaxy.model.History.filter( galaxy.model.History.table.c.user_id==testuser4.id ).all()
if histories:
raise AssertionError( 'Histories were incorrectly created for user %s when the admin created the account' % email )
# Make sure the user was not associated with any groups
if testuser4.groups:
raise AssertionError( 'Groups were incorrectly associated with user %s when the admin created the account' % email )
if not previously_created:
# Make sure a history was not created ( previous test runs may have left deleted histories )
histories = galaxy.model.History.filter( and_( galaxy.model.History.table.c.user_id==testuser4.id,
galaxy.model.History.table.c.deleted==False ) ).all()
if histories:
raise AssertionError( 'Histories were incorrectly created for user %s when the admin created the account' % email )
# Make sure the user was not associated with any groups
if testuser4.groups:
raise AssertionError( 'Groups were incorrectly associated with user %s when the admin created the account' % email )
def test_15_reset_password_as_admin( self ):
"""Testing reseting a user password as admin"""
email = 'test4@bx.psu.edu'
@@ -268,7 +275,7 @@ class TestSecurityAndLibraries( TwillTestCase ):
name = 'Role One'
description = 'This is Role One'
user_ids=[ str( testuser1.id ), str( testuser2.id ), str( testuser4.id ) ]
self.create_role( name=name, description=description, user_ids=user_ids, private_role=testuser1.email )
previously_created = self.create_role( name=name, description=description, user_ids=user_ids, private_role=testuser1.email )
# Get the role object for later tests
global role_one
role_one = galaxy.model.Role.filter( galaxy.model.Role.table.c.name==name ).first()
@@ -283,14 +290,14 @@ class TestSecurityAndLibraries( TwillTestCase ):
user.refresh()
if not user.roles:
raise AssertionError( 'No UserRoleAssociations were created for user %s when a new role was created' % user.email )
if len( user.roles ) != 2:
if not previously_created and len( user.roles ) != 2:
raise AssertionError( '%d UserRoleAssociations are associated with user %s ( should be 2 )' % ( len( user.roles ), user.email ) )
def test_30_create_group( self ):
"""Testing creating new group with 3 members and 1 associated role"""
name = 'Group One'
user_ids=[ str( testuser1.id ), str( testuser2.id ), str( testuser4.id ) ]
role_ids=[ str( role_one.id ) ]
self.create_group( name=name, user_ids=user_ids, role_ids=role_ids )
previously_created = self.create_group( name=name, user_ids=user_ids, role_ids=role_ids )
# Get the group object for later tests
global group_one
group_one = galaxy.model.Group.filter( galaxy.model.Group.table.c.name==name ).first()
@@ -350,11 +357,11 @@ class TestSecurityAndLibraries( TwillTestCase ):
group_ids=[ str( group_two.id ) ]
private_role=testuser1.email
# STEP 1: create the role
self.create_role( name=name,
description=description,
user_ids=user_ids,
group_ids=group_ids,
private_role=private_role )
previously_created = self.create_role( name=name,
description=description,
user_ids=user_ids,
group_ids=group_ids,
private_role=private_role )
# Get the role object for later tests
global role_two
role_two = galaxy.model.Role.filter( galaxy.model.Role.table.c.name==name ).first()
@@ -392,6 +399,13 @@ class TestSecurityAndLibraries( TwillTestCase ):
#self.associate_groups_with_role( str( role_two.id ), group_names=group_names )
#self.visit_page( 'admin/roles' )
#self.check_page_for_string( group_one.name )
#
# Manually delete the userRoleAssociation for later test runs
for ura in testuser1.roles:
if ura.role_id == role_two.id:
ura.delete()
ura.flush()
break
def test_39_create_library( self ):
"""Testing creating new library"""
name = 'Library One'
@@ -574,7 +588,25 @@ class TestSecurityAndLibraries( TwillTestCase ):
role = galaxy.model.Role.get( ura.role_id )
if role.type != 'private':
raise AssertionError( 'UserRoleAssociations for user %s are not related with the private role.' % testuser4.email )
def test_81_purge_group( self ):
def test_81_manually_unpurge_user( self ):
"""Testing manually un-purging a user account"""
# Reset the user for later test runs. The user's private Role and DefaultUserPermissions for that role
# should have been preserved, so all we need to do is reset purged and deleted.
# TODO: If we decide to implement the GUI feature for un-purging a user, replace this with a method call
testuser4.purged = False
testuser4.deleted = False
testuser4.flush()
# Need to also manually add user as a member of group_one for later test runs
uga = galaxy.model.UserGroupAssociation( testuser4, group_one )
uga.flush()
def test_84_edit_role_membership( self ):
"""Testing adding a new member to an existing role"""
# TODO: Twill throws an exception on this...
#self.associate_users_with_role( str( role_one.id ), user_emails=[ str( testuser4.email ) ] )
# Due to the above bug in twill, we need to manaually re-associate the user with the role for later test runs.
ura = galaxy.model.UserRoleAssociation( testuser4, role_one )
ura.flush()
def test_87_purge_group( self ):
"""Testing purging a group"""
group_id = str( group_two.id )
self.mark_group_deleted( group_id )
@@ -587,7 +619,9 @@ class TestSecurityAndLibraries( TwillTestCase ):
gra = galaxy.model.GroupRoleAssociation.filter( galaxy.model.GroupRoleAssociation.table.c.group_id == group_id ).all()
if gra:
raise AssertionError( "Purging the group did not delete the GroupRoleAssociations for group_id '%s'" % group_id )
def test_84_purge_role( self ):
# Undelete the group for later test runs
self.undelete_group( group_id )
def test_90_purge_role( self ):
"""Testing purging a role"""
role_id = str( role_two.id )
self.mark_role_deleted( role_id )
@@ -612,7 +646,16 @@ class TestSecurityAndLibraries( TwillTestCase ):
adra = galaxy.model.ActionDatasetRoleAssociation.filter( galaxy.model.ActionDatasetRoleAssociation.table.c.role_id == role_id ).all()
if adra:
raise AssertionError( "Purging the role did not delete the ActionDatasetRoleAssociations for role_id '%s'" % role_id )
def test_87_purge_library( self ):
# Manually unpurge, then undelete the role for later test runs
role_two.perged = False
role_two.flush()
self.undelete_role( role_id )
# Manually re-associate groups and users for later test runs.
ura = galaxy.model.UserRoleAssociation( testuser1, role_two )
ura.flush()
uga = galaxy.model.GroupRoleAssociation( group_two, role_two )
uga.flush()
def test_93_purge_library( self ):
"""Testing purging a library"""
self.purge_library( str( library.id ) )
# Make sure the library was purged