1 new commit in galaxy-central: https://bitbucket.org/galaxy/galaxy-central/commits/3be9ecc2030b/ Changeset: 3be9ecc2030b User: greg Date: 2013-04-25 22:51:25 Summary: More tool shed dict fixes. Affected #: 1 file diff -r dc08c095b1a53fab468b21706889e3a87400648f -r 3be9ecc2030b096dce14b6c8f91a347c88b39c64 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 @@ -999,7 +999,7 @@ if tool_test_results_dict: folder_id += 1 tool_test_results_root_folder = Folder( id=folder_id, key='root', label='root', parent=None ) - test_environment_dict = tool_test_results_dict[ 'test_environment' ] + test_environment_dict = tool_test_results_dict.get( 'test_environment', None ) if test_environment_dict: folder_id += 1 test_results_folder = Folder( id=folder_id, key='test_results', label=label, parent=tool_test_results_root_folder ) @@ -1008,17 +1008,17 @@ folder = Folder( id=folder_id, key='test_environment', label='Automated test environment', parent=test_results_folder ) test_results_folder.folders.append( folder ) test_environment = TestEnvironment( id=1, - architecture=test_environment_dict[ 'architecture' ], - galaxy_database_version=test_environment_dict[ 'galaxy_database_version' ], - galaxy_revision=test_environment_dict[ 'galaxy_revision' ], - python_version=test_environment_dict[ 'python_version' ], - system=test_environment_dict[ 'system' ], + architecture=test_environment_dict.get( 'architecture', '' ), + galaxy_database_version=test_environment_dict.get( 'galaxy_database_version', '' ), + galaxy_revision=test_environment_dict.get( 'galaxy_revision', '' ), + python_version=test_environment_dict.get( 'python_version', '' ), + system=test_environment_dict.get( 'system', '' ), time_last_tested=time_last_tested, - tool_shed_database_version=test_environment_dict[ 'tool_shed_database_version' ], - tool_shed_mercurial_version=test_environment_dict[ 'tool_shed_mercurial_version' ], - tool_shed_revision=test_environment_dict[ 'tool_shed_revision' ] ) + tool_shed_database_version=test_environment_dict.get( 'tool_shed_database_version', '' ), + 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 ) - passed_tests_dicts = tool_test_results_dict[ 'passed_tests' ] + passed_tests_dicts = tool_test_results_dict.get( 'passed_tests', [] ) if passed_tests_dicts: folder_id += 1 folder = Folder( id=folder_id, key='passed_tests', label='Tests that passed successfully', parent=test_results_folder ) @@ -1032,7 +1032,7 @@ tool_id=passed_tests_dict.get( 'tool_id', '' ), tool_version=passed_tests_dict.get( 'tool_version', '' ) ) folder.passed_tests.append( passed_test ) - failed_tests_dicts = tool_test_results_dict[ 'failed_tests' ] + failed_tests_dicts = tool_test_results_dict.get( 'failed_tests', [] ) if failed_tests_dicts: folder_id += 1 folder = Folder( id=folder_id, key='failed_tests', label='Tests that failed', parent=test_results_folder ) 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.