1 new commit in galaxy-central:
https://bitbucket.org/galaxy/galaxy-central/commits/4e990792d374/
Changeset: 4e990792d374
User: jmchilton
Date: 2015-02-04 01:09:46+00:00
Summary: Fix unit tests for ddbe0d1.
Affected #: 1 file
diff -r 655ddcb3e5a8a5eda97a031b3803d053caa5e963 -r 4e990792d37479e8fb4f6fec272efb51764c5252 test/unit/tools/test_evaluation.py
--- a/test/unit/tools/test_evaluation.py
+++ b/test/unit/tools/test_evaluation.py
@@ -29,6 +29,7 @@
# To Test:
# - param_file handling.
+TEST_TOOL_DIRECTORY = "/path/to/the/tool"
class ToolEvaluatorTestCase(TestCase, UsesApp):
@@ -245,6 +246,9 @@
else:
return super(TestComputeEnviornment, self).unstructured_path_rewriter()
+ def tool_directory( self ):
+ return TEST_TOOL_DIRECTORY
+
class MockTool( object ):
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/655ddcb3e5a8/
Changeset: 655ddcb3e5a8
User: carlfeberhard
Date: 2015-02-03 21:54:39+00:00
Summary: Browser test: use new object param style in history api tests
Affected #: 1 file
diff -r b9dd3817bdabd5c61990af589d31c1097b3c5de6 -r 655ddcb3e5a8a5eda97a031b3803d053caa5e963 test/casperjs/api-history-tests.js
--- a/test/casperjs/api-history-tests.js
+++ b/test/casperjs/api-history-tests.js
@@ -99,7 +99,7 @@
"Id of last history (from index) DOES NOT appear: " + newFirstHistory.id );
this.test.comment( 'calling index with delete=true should include the deleted history' );
- newFirstHistory = this.api.histories.index( true )[0];
+ newFirstHistory = this.api.histories.index({ deleted: true })[0];
//this.debug( 'newFirstHistory:\n' + this.jsonStr( newFirstHistory ) );
this.test.assert( newFirstHistory.id === createdHistory.id,
"Id of last history (from index) DOES appear using index( deleted=true ): " + newFirstHistory.id );
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/e75441f1e264/
Changeset: e75441f1e264
User: carlfeberhard
Date: 2015-02-03 17:47:02+00:00
Summary: Core, authentication: set status code of trans._authenticate_api errors to 403 in _future_expose_api, some readability changes
Affected #: 1 file
diff -r bcaffc4a0a61d3d803cee45435548d0db0e59e54 -r e75441f1e264318e2004f27b3cc868f237f3b6d2 lib/galaxy/web/framework/decorators.py
--- a/lib/galaxy/web/framework/decorators.py
+++ b/lib/galaxy/web/framework/decorators.py
@@ -202,19 +202,20 @@
"""
@wraps(func)
def decorator( self, trans, *args, **kwargs ):
+ # errors passed in from trans._authenicate_api
if trans.error_message:
- # TODO: Document this branch, when can this happen,
- # I don't understand it.
- return __api_error_response( trans, err_msg=trans.error_message )
+ return __api_error_response( trans, status_code=403, err_code=error_codes.USER_NO_API_KEY,
+ err_msg=trans.error_message )
+ if trans.anonymous:
+ # error if anon and user required
+ if user_required:
+ return __api_error_response( trans, status_code=403, err_code=error_codes.USER_NO_API_KEY,
+ err_msg="API authentication required for this request" )
+ # error if anon and no session
+ if not trans.galaxy_session and user_or_session_required:
+ return __api_error_response( trans, status_code=403, err_code=error_codes.USER_NO_API_KEY,
+ err_msg="API authentication required for this request" )
- # error if user required and anon
- # error if anon and no session
- if ( ( trans.anonymous and user_required )
- or ( trans.anonymous and user_or_session_required and not trans.galaxy_session ) ):
- error_code = error_codes.USER_NO_API_KEY
- # Use error codes default error message.
- err_msg = "API authentication required for this request"
- return __api_error_response( trans, err_code=error_code, err_msg=err_msg, status_code=403 )
if trans.request.body:
try:
kwargs['payload'] = __extract_payload_from_request(trans, func, kwargs)
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.