1 new commit in galaxy-central:
https://bitbucket.org/galaxy/galaxy-central/commits/036f57f93b23/
Changeset: 036f57f93b23
User: Dave Bouvier
Date: 2013-05-15 19:44:53
Summary: Update functional tests to reflect recent interface upgrades and enhancements.
Affected #: 4 files
diff -r 93013dcdc4a558791743839d90262e713aba66fd -r 036f57f93b23a62205b8541b6fd773561879827e 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,6 +1,7 @@
from tool_shed.base.twilltestcase import ShedTwillTestCase, common, os
import tool_shed.base.test_db_util as test_db_util
-
+import logging
+log = logging.getLogger(__name__)
repository_name = 'filtering_0000'
repository_description = "Galaxy's filtering tool for test 0000"
repository_long_description = "Long description of Galaxy's filtering tool for test 0000"
@@ -342,8 +343,16 @@
repository = test_db_util.get_repository_by_name_and_owner( repository_name, common.test_user_1_name )
changeset_revision = self.get_repository_tip( repository )
repository_id = self.security.encode_id( repository.id )
+ changelog_tuples = self.get_repository_changelog_tuples( repository )
+ revision_number = -1
+ revision_hash = '000000000000'
+ for numeric_changeset, changeset_hash in changelog_tuples:
+ if str( changeset_hash ) == str( changeset_revision ):
+ revision_number = numeric_changeset
+ revision_hash = changeset_hash
+ break
# Check for the changeset revision, repository name, owner username, 'repos' in the clone url, and the captured
# unicode decoding error message.
- strings_displayed = [ 'Changeset %s' % changeset_revision, 'filtering_0000', 'user1', 'repos', 'added:',
+ strings_displayed = [ 'Changeset %d:%s' % ( revision_number, revision_hash ), 'filtering_0000', 'user1', 'repos', 'added:',
'Error decoding string:', "codec can't decode byte" ]
self.load_changeset_in_tool_shed( repository_id, changeset_revision, strings_displayed=strings_displayed )
\ No newline at end of file
diff -r 93013dcdc4a558791743839d90262e713aba66fd -r 036f57f93b23a62205b8541b6fd773561879827e test/tool_shed/functional/test_0420_citable_urls_for_repositories.py
--- a/test/tool_shed/functional/test_0420_citable_urls_for_repositories.py
+++ b/test/tool_shed/functional/test_0420_citable_urls_for_repositories.py
@@ -148,9 +148,6 @@
test_user_1 = test_db_util.get_user( common.test_user_1_email )
encoded_user_id = self.security.encode_id( test_user_1.id )
encoded_repository_id = self.security.encode_id( repository.id )
- # We are checking the changeset revision pointed to by first_changeset_hash, stored in a global variable at the end of
- # test_0005. The tip changeset hash should not be displayed here, but first_changeset_hash should.
- tip_changeset_hash = self.get_repository_tip( repository )
# Since twill does not load the contents of an iframe, we need to check that the iframe has been generated correctly,
# then directly load the url that the iframe should be loading and check for the expected strings.
# The iframe should point to /repository/view_repository?id=<encoded repository ID>
@@ -158,7 +155,7 @@
strings_displayed_in_iframe = [ 'user1', 'filtering_0420', 'Galaxy filtering tool for test 0420', first_changeset_hash ]
strings_displayed_in_iframe.append( 'Sharable link to this repository revision:' )
strings_displayed_in_iframe.append( '%s/view/user1/filtering_0420/%s' % ( self.url, first_changeset_hash ) )
- strings_not_displayed_in_iframe = [ tip_changeset_hash ]
+ strings_not_displayed_in_iframe = []
self.load_citable_url( username='user1',
repository_name='filtering_0420',
changeset_revision=first_changeset_hash,
@@ -173,20 +170,20 @@
test_user_1 = test_db_util.get_user( common.test_user_1_email )
encoded_user_id = self.security.encode_id( test_user_1.id )
encoded_repository_id = self.security.encode_id( repository.id )
- changeset_hash = '!!invalid!!'
+ invalid_changeset_hash = 'invalid'
tip_revision = self.get_repository_tip( repository )
# Since twill does not load the contents of an iframe, we need to check that the iframe has been generated correctly,
# then directly load the url that the iframe should be loading and check for the expected strings.
# The iframe should point to /repository/view_repository?id=<encoded repository ID>&status=error
strings_displayed = [ '/repository', 'view_repository', 'id=' + encoded_repository_id ]
- strings_displayed.extend( [ 'The+change+log', 'does+not+include+revision', '%21%21invalid%21%21', 'status=error' ] )
+ strings_displayed.extend( [ 'The+change+log', 'does+not+include+revision', invalid_changeset_hash, 'status=error' ] )
strings_displayed_in_iframe = [ 'user1', 'filtering_0420', 'Galaxy filtering tool for test 0420' ]
strings_displayed_in_iframe.append( 'Sharable link to this repository revision:' )
- strings_displayed_in_iframe.append( '%s/view/user1/filtering_0420/%s' % ( self.url, changeset_hash ) )
- strings_not_displayed_in_iframe = [ tip_revision ]
+ strings_displayed_in_iframe.append( '%s/view/user1/filtering_0420/%s' % ( self.url, invalid_changeset_hash ) )
+ strings_not_displayed_in_iframe = []
self.load_citable_url( username='user1',
repository_name='filtering_0420',
- changeset_revision=changeset_hash,
+ changeset_revision=invalid_changeset_hash,
encoded_user_id=encoded_user_id,
encoded_repository_id=encoded_repository_id,
strings_displayed=strings_displayed,
diff -r 93013dcdc4a558791743839d90262e713aba66fd -r 036f57f93b23a62205b8541b6fd773561879827e test/tool_shed/functional/test_1090_install_tool_from_tool_search.py
--- a/test/tool_shed/functional/test_1090_install_tool_from_tool_search.py
+++ b/test/tool_shed/functional/test_1090_install_tool_from_tool_search.py
@@ -296,7 +296,7 @@
exact_matches=False, from_galaxy=True,
strings_displayed=[ 'bwa_color_0090', 'bwa_base_0090', bwa_base_revision, bwa_color_revision ] )
strings_displayed=[ 'freebayes_0090', 'emboss_0090', 'filtering_0090' ]
- strings_displayed.extend( [ 'bwa_color_0090', 'bwa_base_0090', 'emboss_datatypes_0090' ] )
+ strings_displayed.extend( [ 'bwa_color_0090', 'bwa_base_0090' ] )
strings_displayed.extend( [ 'bwa', 'Handle', 'tool dependencies' ] )
repositories_to_install = [ bwa_color_repository, bwa_base_repository ]
# BWA is a good candidate for testing the installation of tool dependencies, but it is a core requirement of functional
diff -r 93013dcdc4a558791743839d90262e713aba66fd -r 036f57f93b23a62205b8541b6fd773561879827e test/tool_shed/functional/test_1300_reset_all_metadata.py
--- a/test/tool_shed/functional/test_1300_reset_all_metadata.py
+++ b/test/tool_shed/functional/test_1300_reset_all_metadata.py
@@ -400,5 +400,14 @@
for repository in repositories:
test_db_util.ga_refresh( repository )
old_metadata = repository_metadata[ self.security.encode_id( repository.id ) ]
- assert repository.metadata == old_metadata, 'Metadata for installed repository %s changed after reset.' % repository.name
+ # When a repository with tools to be displayed in a tool panel section is deactivated and reinstalled,
+ # the tool panel section remains in the repository metadata. However, when the repository's metadata
+ # is subsequently reset, the tool panel section is removed from the repository metadata. While this
+ # is normal and expected behavior, the functional tests assume that repository metadata will not change
+ # in any way after a reset. A workaround is to remove the tool panel section from the stored repository
+ # metadata dict, in order to eliminate the misleading detection of changed metadata.
+ if 'tool_panel_section' in old_metadata and 'tool_panel_section' not in repository.metadata:
+ del old_metadata[ 'tool_panel_section' ]
+ assert repository.metadata == old_metadata, 'Metadata for %s repository %s changed after reset. \nOld: %s\nNew: %s' % \
+ ( repository.status, repository.name, old_metadata, repository.metadata )
\ No newline at end of file
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.
1 new commit in galaxy-central:
https://bitbucket.org/galaxy/galaxy-central/commits/93013dcdc4a5/
Changeset: 93013dcdc4a5
User: Dave Bouvier
Date: 2013-05-15 19:26:12
Summary: Fix for displaying a tool in the tool shed.
Affected #: 1 file
diff -r 413211aaecc51eb38fae668326d4defefda2b8f7 -r 93013dcdc4a558791743839d90262e713aba66fd templates/webapps/tool_shed/repository/tool_form.mako
--- a/templates/webapps/tool_shed/repository/tool_form.mako
+++ b/templates/webapps/tool_shed/repository/tool_form.mako
@@ -107,7 +107,7 @@
%if trans.webapp.name == 'galaxy':
${render_galaxy_repository_actions( repository=repository )}
%else:
- ${render_tool_shed_repository_actions( repository, repo=None, metadata=None, changeset_revision=None )}
+ ${render_tool_shed_repository_actions( repository, metadata=None, changeset_revision=None )}
%endif
%if message:
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.
1 new commit in galaxy-central:
https://bitbucket.org/galaxy/galaxy-central/commits/413211aaecc5/
Changeset: 413211aaecc5
User: dan
Date: 2013-05-15 19:23:45
Summary: Undo 69240f7da05e
Affected #: 1 file
diff -r ca0daccbb90f2a2eabfb5f64156a7c270cbd3eca -r 413211aaecc51eb38fae668326d4defefda2b8f7 lib/galaxy/util/__init__.py
--- a/lib/galaxy/util/__init__.py
+++ b/lib/galaxy/util/__init__.py
@@ -422,10 +422,7 @@
Returns a unicode string or None
"""
if isinstance( value, unicode ):
- try:
- return value.encode( encoding, error )
- except:
- return value
+ return value
try:
return unicode( value, encoding, error )
except:
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.
1 new commit in galaxy-central:
https://bitbucket.org/galaxy/galaxy-central/commits/ca0daccbb90f/
Changeset: ca0daccbb90f
User: dan
Date: 2013-05-15 19:07:07
Summary: Enhance util.unicodify to attempt to force encoding when already an unicode object.
Affected #: 1 file
diff -r 69240f7da05e4ae42803b67a507103d201186306 -r ca0daccbb90f2a2eabfb5f64156a7c270cbd3eca lib/galaxy/util/__init__.py
--- a/lib/galaxy/util/__init__.py
+++ b/lib/galaxy/util/__init__.py
@@ -422,7 +422,10 @@
Returns a unicode string or None
"""
if isinstance( value, unicode ):
- return value
+ try:
+ return value.encode( encoding, error )
+ except:
+ return value
try:
return unicode( value, encoding, error )
except:
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.
1 new commit in galaxy-central:
https://bitbucket.org/galaxy/galaxy-central/commits/eb04cd61c978/
Changeset: eb04cd61c978
User: jgoecks
Date: 2013-05-15 15:17:41
Summary: Trackster bug fix: use computed mode rather than track mode.
Affected #: 1 file
diff -r d6125e3f660caa376323218546b72e4f953dc669 -r eb04cd61c978821c88f793ca3bc51783fd550c05 static/scripts/viz/trackster/tracks.js
--- a/static/scripts/viz/trackster/tracks.js
+++ b/static/scripts/viz/trackster/tracks.js
@@ -3106,12 +3106,12 @@
// Function that returns data/Deferreds needed to draw tile.
var get_data = function() {
// Get the track data, maybe a deferred
- var tile_data = track.data_manager.get_data(region, track.mode, resolution, track.data_url_extra_params);
+ var tile_data = track.data_manager.get_data(region, mode, resolution, track.data_url_extra_params);
// Get reference data if needed, maybe a deferred
var seq_data;
if ( view.reference_track ) {
- seq_data = view.reference_track.data_manager.get_data(region, track.mode, resolution, view.reference_track.data_url_extra_params);
+ seq_data = view.reference_track.data_manager.get_data(region, mode, resolution, view.reference_track.data_url_extra_params);
}
return [tile_data, seq_data];
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.
2 new commits in galaxy-central:
https://bitbucket.org/galaxy/galaxy-central/commits/e99b00df40b2/
Changeset: e99b00df40b2
User: Dave Bouvier
Date: 2013-05-14 22:54:12
Summary: Fix for reinstalling an uninstalled repository when leaving the no changes checkbox checked and entering text into the new tool panel section field.
Affected #: 2 files
diff -r 6d72b2db32c0d84032ee40f2cd86b7b09485c441 -r e99b00df40b2895ee1a36d356dc5c0b968f80f8c lib/tool_shed/galaxy_install/repository_util.py
--- a/lib/tool_shed/galaxy_install/repository_util.py
+++ b/lib/tool_shed/galaxy_install/repository_util.py
@@ -445,7 +445,8 @@
try:
tool_section = trans.app.toolbox.tool_panel[ tool_panel_section_key ]
except KeyError:
- log.debug( 'Invalid tool_panel_section_key "%s" specified. Tools will be loaded outside of sections in the tool panel.' )
+ log.debug( 'Invalid tool_panel_section_key "%s" specified. Tools will be loaded outside of sections in the tool panel.',
+ str( tool_panel_section_key ) )
tool_section = None
else:
tool_section = None
diff -r 6d72b2db32c0d84032ee40f2cd86b7b09485c441 -r e99b00df40b2895ee1a36d356dc5c0b968f80f8c lib/tool_shed/util/tool_util.py
--- a/lib/tool_shed/util/tool_util.py
+++ b/lib/tool_shed/util/tool_util.py
@@ -617,6 +617,9 @@
if 'tools' in metadata:
# This forces everything to be loaded into the same section (or no section) in the tool panel.
if no_changes_checked:
+ # Make sure the no_changes checkbox overrides the new_tool_panel_section if the user checked the checkbox and
+ # entered something into the field.
+ new_tool_panel_section = None
if 'tool_panel_section' in metadata:
tool_panel_dict = metadata[ 'tool_panel_section' ]
if not tool_panel_dict:
https://bitbucket.org/galaxy/galaxy-central/commits/d6125e3f660c/
Changeset: d6125e3f660c
User: Dave Bouvier
Date: 2013-05-14 22:55:16
Summary: Merge.
Affected #: 1 file
diff -r e99b00df40b2895ee1a36d356dc5c0b968f80f8c -r d6125e3f660caa376323218546b72e4f953dc669 lib/tool_shed/util/metadata_util.py
--- a/lib/tool_shed/util/metadata_util.py
+++ b/lib/tool_shed/util/metadata_util.py
@@ -362,7 +362,7 @@
data_tables.append( data_table_name )
if bad_data_table:
continue
- data_manager_metadata_tool_file = os.path.join( relative_data_manager_dir, tool_file )
+ data_manager_metadata_tool_file = os.path.normpath( os.path.join( relative_data_manager_dir, tool_file ) )
tool_metadata_tool_file = os.path.join( repo_files_directory, data_manager_metadata_tool_file )
tool = tools.get( tool_metadata_tool_file, None )
if tool is None:
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.