1 new commit in galaxy-central:
https://bitbucket.org/galaxy/galaxy-central/commits/8264c77e4f07/
Changeset: 8264c77e4f07
User: inithello
Date: 2013-04-28 17:03:41
Summary: Fix failing functional test for dataset features.
Affected #: 2 files
diff -r 6638dbca87d3c7dfc4e5b0522eb4a17f124b5040 -r 8264c77e4f07c0dee932add796f5ee7ce02245b3 test/base/twilltestcase.py
--- a/test/base/twilltestcase.py
+++ b/test/base/twilltestcase.py
@@ -255,6 +255,13 @@
def get_latest_history( self ):
return self.json_from_url( '/api/histories' )[ 0 ]
+
+ def find_hda_by_dataset_name( self, name, history=None ):
+ if history is None:
+ history = self.get_history_from_api()
+ for hda in history:
+ if hda[ 'name' ] == name:
+ return hda
def check_history_for_errors( self ):
"""Raises an exception if there are errors in a history"""
diff -r 6638dbca87d3c7dfc4e5b0522eb4a17f124b5040 -r 8264c77e4f07c0dee932add796f5ee7ce02245b3 test/functional/test_dataset_features.py
--- a/test/functional/test_dataset_features.py
+++ b/test/functional/test_dataset_features.py
@@ -1,7 +1,9 @@
from base.twilltestcase import TwillTestCase
import base.test_db_util as test_db_util
+
class TestDatasetFeatures( TwillTestCase ):
+
def test_0000_initiate_users( self ):
"""Ensuring all required user accounts exist"""
self.logout()
@@ -16,14 +18,18 @@
self.new_history()
latest_history = test_db_util.get_latest_history_for_user( admin_user )
assert latest_history is not None, "Problem retrieving latest_history from database"
+
def test_0005_initiate_data( self ):
'''Ensure that data exists for this test suite.'''
self.upload_file( '1.bed' )
+
def test_0010_view_dataset_params( self ):
'''Test viewing a dataset's parameters.'''
- hda = test_db_util.get_latest_hda()
- self.visit_url( '/datasets/%s/show_params' % self.security.encode_id( hda.hid ) )
+ hda = self.find_hda_by_dataset_name( '1.bed' )
+ assert hda is not None, 'Could not retrieve latest hda from history API.'
+ self.visit_url( '/datasets/%s/show_params' % hda[ 'id'] )
self.check_for_strings( strings_displayed=[ '1.bed', 'uploaded' ] )
+
def test_0015_report_dataset_error( self ):
'''Load and submit the report error form. This should show an error message, as the functional test instance should not be configured for email.'''
hda = test_db_util.get_latest_hda()
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/a0877019caa1/
Changeset: a0877019caa1
User: carlfeberhard
Date: 2013-04-26 21:26:33
Summary: Functional tests: update test_history_functions 060 to use the new json variable name in history.mako
Affected #: 1 file
diff -r 365d31607a569575ac666d142556403fe82d693a -r a0877019caa1e1f6b4407d92eaa7c44f654d27df test/functional/test_history_functions.py
--- a/test/functional/test_history_functions.py
+++ b/test/functional/test_history_functions.py
@@ -656,7 +656,7 @@
if hda[ 'id' ] == self.security.encode_id( hda_2_bed.id ):
return ( not hda[ 'accessible' ] )
return False
- self.check_history_json( r'\bhdas\s*=\s*(.*);', hda_2_bed_is_inaccessible )
+ self.check_history_json( r'\bhdaJson\s*=\s*(.*);', hda_2_bed_is_inaccessible )
# Admin users can view all datasets ( using the history/view feature ), so make sure 2.bed is accessible to the admin
self.logout()
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/4de773e06e14/
Changeset: 4de773e06e14
User: inithello
Date: 2013-04-26 17:16:16
Summary: Update rss feed per changes in tool test results dict.
Affected #: 1 file
diff -r 3c9b47aca3a5d25f23fcccfbc8e42d897dd39743 -r 4de773e06e148df80d85783b04408307ba277f00 lib/galaxy/webapps/tool_shed/controllers/repository.py
--- a/lib/galaxy/webapps/tool_shed/controllers/repository.py
+++ b/lib/galaxy/webapps/tool_shed/controllers/repository.py
@@ -1122,10 +1122,11 @@
# Generate a citable URL for this repository with owner and changeset revision.
repository_citable_url = suc.url_join( tool_shed_url, 'view', user.username, repository.name, metadata_row.changeset_revision )
title = 'Functional test results for changeset revision %s of %s' % ( metadata_row.changeset_revision, repository.name )
- tests_passed = len( metadata_row.tool_test_results.get( 'tests_passed', [] ) )
- tests_failed = len( metadata_row.tool_test_results.get( 'test_errors', [] ) )
- invalid_tests = len( metadata_row.tool_test_results.get( 'invalid_tests', [] ) )
- description = '%d tests passed, %d tests failed, %d tests determined to be invalid.' % ( tests_passed, tests_failed, invalid_tests )
+ passed_tests = len( metadata_row.tool_test_results.get( 'passed_tests', [] ) )
+ failed_tests = len( metadata_row.tool_test_results.get( 'failed_tests', [] ) )
+ missing_test_components = len( metadata_row.tool_test_results.get( 'missing_test_components', [] ) )
+ description = '%d tests passed, %d tests failed, %d tests missing test components.' % \
+ ( passed_tests, failed_tests, missing_test_components )
# The guid attribute in an RSS feed's list of items allows a feed reader to choose not to show an item as updated
# if the guid is unchanged. For functional test results, the citable URL is sufficiently unique to enable
# that behavior.
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.