1 new commit in galaxy-central:

https://bitbucket.org/galaxy/galaxy-central/changeset/593c0d6c3d44/ changeset: 593c0d6c3d44 user: greg date: 2012-11-26 17:43:38 summary: Fixes for tool shed functional tests. affected #: 3 files

diff -r 770580cf77ccd49f2a8c2aab2b559c45a318db51 -r 593c0d6c3d447aaa79c61fea2688b6091b44dda5 test/tool_shed/base/test_db_util.py --- a/test/tool_shed/base/test_db_util.py +++ b/test/tool_shed/base/test_db_util.py @@ -1,9 +1,6 @@ import galaxy.webapps.community.model as model from galaxy.model.orm import * from galaxy.webapps.community.model.mapping import context as sa_session -from base.twilltestcase import * -from sqlalchemy import desc -import sys

def delete_obj( obj ): sa_session.delete( obj )

diff -r 770580cf77ccd49f2a8c2aab2b559c45a318db51 -r 593c0d6c3d447aaa79c61fea2688b6091b44dda5 test/tool_shed/base/twilltestcase.py --- a/test/tool_shed/base/twilltestcase.py +++ b/test/tool_shed/base/twilltestcase.py @@ -1,5 +1,4 @@ from base.twilltestcase import * -from tool_shed.base.test_db_util import *

class ShedTwillTestCase( TwillTestCase ): def setUp( self ): @@ -37,7 +36,7 @@ self.check_for_strings( strings_displayed, strings_not_displayed ) def check_for_valid_tools( self, repository ): self.manage_repository( repository ) - self.check_page_for_string( '<b>Valid tools</b><i> - click the name to preview the tool' ) + self.check_page_for_string( 'Valid tools' ) def check_repository_changelog( self, repository, strings_displayed=[], strings_not_displayed=[] ): url = '/repository/view_changelog?id=%s' % self.security.encode_id( repository.id ) self.visit_url( url ) @@ -149,6 +148,6 @@ self.visit_url( '/upload/upload?repository_id=%s' % self.security.encode_id( repository.id ) ) for key in kwargs: tc.fv( "1", key, kwargs[ key ] ) - tc.formfile( "1", "file_data", filename ) + tc.formfile( "1", "file_data", self.get_filename( filename ) ) tc.submit( "upload_button" ) self.check_for_strings( strings_displayed, strings_not_displayed )

diff -r 770580cf77ccd49f2a8c2aab2b559c45a318db51 -r 593c0d6c3d447aaa79c61fea2688b6091b44dda5 test/tool_shed/functional/test_0000_basic_repository_features.py --- a/test/tool_shed/functional/test_0000_basic_repository_features.py +++ b/test/tool_shed/functional/test_0000_basic_repository_features.py @@ -1,8 +1,3 @@ -import tempfile, time, re, tempfile, os, shutil -import galaxy.webapps.community.model -from galaxy.util import parse_xml, string_as_bool -from galaxy.util.shed_util import clean_tool_shed_url -from galaxy.model.orm import * from tool_shed.base.twilltestcase import * from tool_shed.base.test_db_util import *

@@ -19,8 +14,6 @@ repository_name = 'filter' repository_description = "Galaxy's filter tool" repository_long_description = "Long description of Galaxy's filter tool" -files_path = os.path.abspath( os.path.join( "test", "tool_shed", "test_data" ) ) -filter_filename = os.path.join( files_path, "filtering_1.1.0.tar" )

class TestCreateRepository( ShedTwillTestCase ):

@@ -65,8 +58,9 @@ def test_0030_upload_tarball( self ): """Upload filtering_1.1.0.tar to the repository""" repository = get_repository_by_name( repository_name, admin_username ) - self.upload( repository, filter_filename, \ - strings_displayed=[ "The file '%s' has been successfully uploaded to the repository." % filter_filename ], \ + self.upload( repository, + 'filtering_1.1.0.tar', + strings_displayed=[ "has been successfully uploaded to the repository." ], commit_message="Uploaded filtering 1.1.0" ) self.check_for_valid_tools( repository ) latest_repository_metadata = self.get_latest_repository_metadata_for_repository( repository )

Repository URL: https://bitbucket.org/galaxy/galaxy-central/

--

This is a commit notification from bitbucket.org. You are receiving this because you have the service enabled, addressing the recipient of this email.