1 new commit in galaxy-central:
https://bitbucket.org/galaxy/galaxy-central/commits/393b3d86fbf1/ Changeset: 393b3d86fbf1 User: greg Date: 2013-06-04 21:50:25 Summary: Add a not tested container for the automated tool test results in the tool shed. Affected #: 2 files
diff -r 4466b12313cc7e22e941c1255ba989e3adbbadf1 -r 393b3d86fbf1b8c1471faef828de31110d3a90f5 lib/galaxy/webapps/tool_shed/util/container_util.py --- a/lib/galaxy/webapps/tool_shed/util/container_util.py +++ b/lib/galaxy/webapps/tool_shed/util/container_util.py @@ -36,6 +36,7 @@ self.tool_dependencies = [] self.failed_tests = [] self.missing_test_components = [] + self.not_tested = [] self.passed_tests = [] self.test_environments = [] self.repository_dependencies = [] @@ -161,6 +162,14 @@ self.tool_version = tool_version
+class NotTested( object ): + """NotTested object""" + + def __init__( self, id=None, reason=None ): + self.id = id + self.reason = reason + + class PassedTest( object ): """Passed tool tests object"""
@@ -1048,6 +1057,15 @@ tool_shed_mercurial_version=test_environment_dict.get( 'tool_shed_mercurial_version', '' ), tool_shed_revision=test_environment_dict.get( 'tool_shed_revision', '' ) ) folder.test_environments.append( test_environment ) + not_tested_dict = tool_test_results_dict.get( 'not_tested', {} ) + if not_tested_dict: + folder_id += 1 + folder = Folder( id=folder_id, key='not_tested', label='Not tested', parent=test_results_folder ) + test_results_folder.folders.append( folder ) + not_tested_id = 0 + not_tested = NotTested( id=not_tested_id, + reason=not_tested_dict.get( 'reason', '' ) ) + folder.not_tested.append( not_tested ) passed_tests_dicts = tool_test_results_dict.get( 'passed_tests', [] ) if passed_tests_dicts: folder_id += 1
diff -r 4466b12313cc7e22e941c1255ba989e3adbbadf1 -r 393b3d86fbf1b8c1471faef828de31110d3a90f5 templates/webapps/tool_shed/repository/common.mako --- a/templates/webapps/tool_shed/repository/common.mako +++ b/templates/webapps/tool_shed/repository/common.mako @@ -337,6 +337,11 @@ ${render_failed_test( failed_test, pad, my_row, row_counter )} %endfor %endif + %if folder.not_tested: + %for not_tested in folder.not_tested: + ${render_not_tested( not_tested, pad, my_row, row_counter )} + %endfor + %endif %if folder.passed_tests: %for passed_test in folder.passed_tests: ${render_passed_test( passed_test, pad, my_row, row_counter )} @@ -731,6 +736,35 @@ %></%def>
+<%def name="render_not_tested( not_tested, pad, parent, row_counter, row_is_header=False )"> + <% encoded_id = trans.security.encode_id( not_tested.id ) %> + <style type="text/css"> + #not_tested_table{ table-layout:fixed; + width:100%; + overflow-wrap:normal; + overflow:hidden; + border:0px; + word-break:keep-all; + word-wrap:break-word; + line-break:strict; } + </style> + <tr class="datasetRow" + %if parent is not None: + parent="${parent}" + %endif + id="libraryItem-${encoded_id}"> + <td style="padding-left: ${pad+20}px;"> + <table id="not_tested_table"> + <tr><td>${not_tested.reason | h}</td></tr> + </table> + </td> + </tr> + <% + my_row = row_counter.count + row_counter.increment() + %> +</%def> + <%def name="render_passed_test( passed_test, pad, parent, row_counter, row_is_header=False )"><% encoded_id = trans.security.encode_id( passed_test.id ) %><style type="text/css">
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.