Your public name is an identifier that will be used to generate addresses for information
@@ -103,8 +160,12 @@
%endif
%endif
+
+ If you see this, please leave following field blank.
+
+
-
+
%if registration_warning_message:
diff --git a/test/base/twilltestcase.py b/test/base/twilltestcase.py
index b78a11e54cd..0e3a4ef9d0a 100644
--- a/test/base/twilltestcase.py
+++ b/test/base/twilltestcase.py
@@ -952,11 +952,11 @@ class TwillTestCase( unittest.TestCase ):
# HACK: don't use panels because late_javascripts() messes up the twill browser and it
# can't find form fields (and hence user can't be logged in).
self.visit_url( "%s/user/create?cntrller=%s&use_panels=False" % ( self.url, cntrller ) )
- tc.fv( '1', 'email', email )
- tc.fv( '1', 'redirect', redirect )
- tc.fv( '1', 'password', password )
- tc.fv( '1', 'confirm', password )
- tc.fv( '1', 'username', username )
+ tc.fv( 'registration', 'email', email )
+ tc.fv( 'registration', 'redirect', redirect )
+ tc.fv( 'registration', 'password', password )
+ tc.fv( 'registration', 'confirm', password )
+ tc.fv( 'registration', 'username', username )
tc.submit( 'create_user_button' )
previously_created = False
username_taken = False
diff --git a/test/install_and_test_tool_shed_repositories/base/test_db_util.py b/test/install_and_test_tool_shed_repositories/base/test_db_util.py
index 0cd53cafa44..7afade375b7 100644
--- a/test/install_and_test_tool_shed_repositories/base/test_db_util.py
+++ b/test/install_and_test_tool_shed_repositories/base/test_db_util.py
@@ -8,39 +8,59 @@ log = logging.getLogger(__name__)
def delete_obj( obj ):
sa_session.delete( obj )
sa_session.flush()
+
def delete_user_roles( user ):
for ura in user.roles:
sa_session.delete( ura )
sa_session.flush()
+
def flush( obj ):
sa_session.add( obj )
sa_session.flush()
+
def get_repository( repository_id ):
return sa_session.query( model.ToolShedRepository ) \
.filter( model.ToolShedRepository.table.c.id == repository_id ) \
.first()
+
def get_installed_repository_by_name_owner_changeset_revision( name, owner, changeset_revision ):
return sa_session.query( model.ToolShedRepository ) \
.filter( and_( model.ToolShedRepository.table.c.name == name,
model.ToolShedRepository.table.c.owner == owner,
model.ToolShedRepository.table.c.installed_changeset_revision == changeset_revision ) ) \
.one()
+
def get_private_role( user ):
for role in user.all_roles():
if role.name == user.email and role.description == 'Private Role for %s' % user.email:
return role
raise AssertionError( "Private role not found for user '%s'" % user.email )
+
+def get_tool_dependencies_for_installed_repository( repository_id, status=None ):
+ if status is not None:
+ return sa_session.query( model.ToolDependency ) \
+ .filter( and_( model.ToolDependency.table.c.tool_shed_repository_id == repository_id,
+ model.ToolDependency.table.c.status == status ) ) \
+ .all()
+ else:
+ return sa_session.query( model.ToolDependency ) \
+ .filter( model.ToolDependency.table.c.tool_shed_repository_id == repository_id ) \
+ .all()
+
def mark_obj_deleted( obj ):
obj.deleted = True
sa_session.add( obj )
sa_session.flush()
+
def refresh( obj ):
sa_session.refresh( obj )
+
def get_private_role( user ):
for role in user.all_roles():
if role.name == user.email and role.description == 'Private Role for %s' % user.email:
return role
raise AssertionError( "Private role not found for user '%s'" % user.email )
+
def get_user( email ):
return sa_session.query( model.User ) \
.filter( model.User.table.c.email==email ) \
diff --git a/test/install_and_test_tool_shed_repositories/base/twilltestcase.py b/test/install_and_test_tool_shed_repositories/base/twilltestcase.py
index 435861b0a96..7f6232956ac 100644
--- a/test/install_and_test_tool_shed_repositories/base/twilltestcase.py
+++ b/test/install_and_test_tool_shed_repositories/base/twilltestcase.py
@@ -149,4 +149,20 @@ class InstallTestRepository( TwillTestCase ):
strings_displayed.append( 'has been deactivated' )
else:
strings_displayed.append( 'has been uninstalled' )
- self.check_for_strings( strings_displayed, strings_not_displayed=[] )
\ No newline at end of file
+ self.check_for_strings( strings_displayed, strings_not_displayed=[] )
+ # Get all tool dependencies that are in an error state and uninstall them explicitly, so that the next installation attempt
+ # may succeed.
+ error_state = model.ToolDependency.installation_status.ERROR
+ tool_dependencies = test_db_util.get_tool_dependencies_for_installed_repository( installed_repository.id, status=error_state )
+ if len( tool_dependencies ) > 0:
+ encoded_tool_dependency_ids = [ self.security.encode_id( tool_dependency.id ) for tool_dependency in tool_dependencies ]
+ self.uninstall_tool_dependencies( self.security.encode_id( installed_repository.id ), encoded_tool_dependency_ids )
+
+ def uninstall_tool_dependencies( self, encoded_repository_id, encoded_tool_dependency_ids ):
+ tool_dependency_ids = ','.join( encoded_tool_dependency_ids )
+ url = '/admin_toolshed/uninstall_tool_dependencies?repository_id=%s&inst_td_ids=%s&operation=uninstall' % \
+ ( encoded_repository_id, tool_dependency_ids )
+ self.visit_url( url )
+ tc.fv( 'uninstall_tool_dependencies', 'tool_dependency_ids', tool_dependency_ids )
+ tc.submit( 'uninstall_tool_dependencies_button' )
+
\ No newline at end of file