opensource/galaxy
3
0
Fork 0
mirror of https://github.com/galaxyproject/galaxy.git synced 2026-09-24 16:30:27 +08:00
Code Issues Packages Projects Releases Wiki Activity

Functional tests: fix sqlite db_path var; fix api test for hda update with nonsense key

Browse Source
This commit is contained in:
Carl Eberhard
2013-08-21 10:00:09 -07:00
parent 02f9b4947e
commit 89c8698169
2 changed files with 6 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files
scripts/functional_tests.py
+1 -1
View File
@@ -243,7 +243,7 @@ def main():
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:
test/casperjs/api-hda-tests.js
+5 -12
View File
@@ -135,18 +135,11 @@ spaceghost.historypanel.waitForHdas().then( function(){
});
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 = {};