1 new commit in galaxy-central:

https://bitbucket.org/galaxy/galaxy-central/commits/33092bc258d7/ Changeset: 33092bc258d7 User: carlfeberhard Date: 2013-08-21 19:00:09 Summary: Functional tests: fix sqlite db_path var; fix api test for hda update with nonsense key Affected #: 2 files

diff -r 408f39acefc287815aa0c2672cc92f0f83e55ff9 -r 33092bc258d7b11668bfe9ea0d5b6e3817ac0a46 scripts/functional_tests.py --- a/scripts/functional_tests.py +++ b/scripts/functional_tests.py @@ -243,7 +243,7 @@ if 'GALAXY_TEST_DBURI' in os.environ: database_connection = os.environ['GALAXY_TEST_DBURI'] else: - database_connection = 'sqlite:///' + os.path.join( db_path, 'universe.sqlite' ) + database_connection = 'sqlite:///' + os.path.join( galaxy_db_path, 'universe.sqlite' ) kwargs = {} for dir in file_path, new_file_path: try:

diff -r 408f39acefc287815aa0c2672cc92f0f83e55ff9 -r 33092bc258d7b11668bfe9ea0d5b6e3817ac0a46 test/casperjs/api-hda-tests.js --- a/test/casperjs/api-hda-tests.js +++ b/test/casperjs/api-hda-tests.js @@ -135,18 +135,11 @@ }); this.test.assert( countKeys( returned ) === 0, "No changed returned: " + this.jsonStr( returned ) );

- this.test.comment( 'updating using a nonsense key should fail with an error' ); - var err = {}; - try { - returned = this.api.hdas.update( lastHistory.id, firstHda.id, { - konamiCode : 'uuddlrlrba' - }); - } catch( error ){ - err = error; - //this.debug( this.jsonStr( err ) ); - } - this.test.assert( !!err.message, "Error occurred: " + err.message ); - this.test.assert( err.status === 400, "Error status is 400: " + err.status ); + this.test.comment( 'updating using a nonsense key should NOT fail with an error' ); + returned = this.api.hdas.update( lastHistory.id, firstHda.id, { + konamiCode : 'uuddlrlrba' + }); + this.test.assert( countKeys( returned ) === 0, "No changed returned: " + this.jsonStr( returned ) );

this.test.comment( 'updating by attempting to change type should cause an error' ); err = {};

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.