opensource/galaxy
3
0
Fork 0
mirror of https://github.com/galaxyproject/galaxy.git synced 2026-10-24 12:13:33 +08:00
Code Issues Packages Projects Releases Wiki Activity

Remove abstraction around requests now that it is a required dependency.

Browse Source
This commit is contained in:
John Chilton
2014-09-04 20:34:52 -04:00
parent 7630733b91
commit e58d1d9c8a
7 changed files with 31 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files
test/api/test_authenticate.py
+3 -3
View File
@@ -1,6 +1,6 @@
import base64
from base.interactor import get_request
from requests import get
from base import api
@@ -18,12 +18,12 @@ class AuthenticationApiTestCase( api.ApiTestCase ):
headers = {
"Authorization": authorization,
}
auth_response = get_request( baseauth_url, headers=headers )
auth_response = get( baseauth_url, headers=headers )
self._assert_status_code_is( auth_response, 200 )
auth_dict = auth_response.json()
self._assert_has_keys( auth_dict, "api_key" )
# Verify key...
random_api_url = self._api_url( "users", use_key=False )
random_api_response = get_request( random_api_url, params=dict( key=auth_dict[ "api_key" ] ) )
random_api_response = get( random_api_url, params=dict( key=auth_dict[ "api_key" ] ) )
self._assert_status_code_is( random_api_response, 200 )
test/api/test_histories.py
+7 -8
View File
@@ -1,8 +1,7 @@
from base import api
# requests.{post,put,get} or something like it if unavailable
from base.interactor import post_request
from base.interactor import put_request
from base.interactor import get_request
from requests import post
from requests import put
from requests import get
from .helpers import DatasetPopulator, wait_on
@@ -29,7 +28,7 @@ class HistoriesApiTestCase( api.ApiTestCase ):
post_data = dict( name="CannotCreate" )
# Using lower-level _api_url will cause key to not be injected.
histories_url = self._api_url( "histories" )
create_response = post_request( url=histories_url, data=post_data )
create_response = post( url=histories_url, data=post_data )
self._assert_status_code_is( create_response, 403 )
def test_import_export( self ):
@@ -38,7 +37,7 @@ class HistoriesApiTestCase( api.ApiTestCase ):
self.dataset_populator.wait_for_history( history_id, assert_ok=True )
download_path = self._export( history_id )
full_download_url = "%s%s?key=%s" % ( self.url, download_path, self.galaxy_interactor.api_key )
download_response = get_request( full_download_url )
download_response = get( full_download_url )
self._assert_status_code_is( download_response, 200 )
def history_names():
@@ -72,11 +71,11 @@ class HistoriesApiTestCase( api.ApiTestCase ):
def _export(self, history_id):
export_url = self._api_url( "histories/%s/exports" % history_id, use_key=True )
put_response = put_request( export_url )
put_response = put( export_url )
self._assert_status_code_is( put_response, 202 )
def export_ready_response():
put_response = put_request( export_url )
put_response = put( export_url )
if put_response.status_code == 202:
return None
return put_response
test/api/test_history_contents.py
+6 -8
View File
@@ -4,10 +4,8 @@ import json
from .helpers import TestsDatasets
from .helpers import LibraryPopulator
from .helpers import DatasetCollectionPopulator
from base.interactor import (
put_request,
delete_request,
)
from requests import delete
from requests import put
# TODO: Test anonymous access.
@@ -72,7 +70,7 @@ class HistoryContentsApiTestCase( api.ApiTestCase, TestsDatasets ):
update_url = self._api_url( "histories/%s/contents/%s" % ( self.history_id, hda1[ "id" ] ), use_key=True )
# Awkward json.dumps required here because of https://trello.com/c/CQwmCeG6
body = json.dumps( dict( deleted=True ) )
update_response = put_request( update_url, data=body )
update_response = put( update_url, data=body )
self._assert_status_code_is( update_response, 200 )
show_response = self.__show( hda1 )
assert str( show_response.json()[ "deleted" ] ).lower() == "true"
@@ -82,7 +80,7 @@ class HistoryContentsApiTestCase( api.ApiTestCase, TestsDatasets ):
self._wait_for_history( self.history_id )
assert str( self.__show( hda1 ).json()[ "deleted" ] ).lower() == "false"
url = self._api_url( "histories/%s/contents/%s" % ( self.history_id, hda1["id" ] ), use_key=True )
delete_response = delete_request( url )
delete_response = delete( url )
assert delete_response.status_code < 300 # Something in the 200s :).
assert str( self.__show( hda1 ).json()[ "deleted" ] ).lower() == "true"
@@ -119,7 +117,7 @@ class HistoryContentsApiTestCase( api.ApiTestCase, TestsDatasets ):
assert not dataset_collection[ "deleted" ]
delete_response = delete_request( self._api_url( collection_url, use_key=True ) )
delete_response = delete( self._api_url( collection_url, use_key=True ) )
self._assert_status_code_is( delete_response, 200 )
show_response = self._get( collection_url )
@@ -137,7 +135,7 @@ class HistoryContentsApiTestCase( api.ApiTestCase, TestsDatasets ):
update_url = self._api_url( "histories/%s/contents/dataset_collections/%s" % ( self.history_id, hdca[ "id" ] ), use_key=True )
# Awkward json.dumps required here because of https://trello.com/c/CQwmCeG6
body = json.dumps( dict( name="newnameforpair" ) )
update_response = put_request( update_url, data=body )
update_response = put( update_url, data=body )
self._assert_status_code_is( update_response, 200 )
show_response = self.__show( hdca )
assert str( show_response.json()[ "name" ] ) == "newnameforpair"
test/api/test_pages.py
+4 -4
View File
@@ -1,6 +1,6 @@
from galaxy.exceptions import error_codes
from base import api
from base.interactor import delete_request
from requests import delete
from operator import itemgetter
@@ -68,17 +68,17 @@ class PageApiTestCase( BasePageApiTestCase ):
def test_delete( self ):
response_json = self._create_valid_page_with_slug( "testdelete" )
delete_response = delete_request( self._api_url( "pages/%s" % response_json[ 'id' ], use_key=True ) )
delete_response = delete( self._api_url( "pages/%s" % response_json[ 'id' ], use_key=True ) )
self._assert_status_code_is( delete_response, 200 )
def test_404_on_delete_unknown_page( self ):
delete_response = delete_request( self._api_url( "pages/%s" % self._random_key(), use_key=True ) )
delete_response = delete( self._api_url( "pages/%s" % self._random_key(), use_key=True ) )
self._assert_status_code_is( delete_response, 404 )
self._assert_error_code_is( delete_response, error_codes.USER_OBJECT_NOT_FOUND )
def test_403_on_delete_unowned_page( self ):
page_response = self._create_valid_page_as( "others_page@bx.psu.edu", "otherspage" )
delete_response = delete_request( self._api_url( "pages/%s" % page_response[ "id" ], use_key=True ) )
delete_response = delete( self._api_url( "pages/%s" % page_response[ "id" ], use_key=True ) )
self._assert_status_code_is( delete_response, 403 )
self._assert_error_code_is( delete_response, error_codes.USER_DOES_NOT_OWN_ITEM )
test/api/test_search.py
+2 -2
View File
@@ -1,5 +1,5 @@
from base import api
from base.interactor import delete_request
from requests import delete
from .helpers import WorkflowPopulator
@@ -14,7 +14,7 @@ class SearchApiTestCase( api.ApiTestCase ):
# Deleted
delete_url = self._api_url( "workflows/%s" % workflow_id, use_key=True )
delete_request( delete_url )
delete( delete_url )
search_response = self.__search( "select * from workflow where deleted = False" )
assert not self.__has_result_with_name( search_response, "test_for_search (imported from API)" ), search_response.json()
test/api/test_workflows.py
+4 -3
View File
@@ -8,7 +8,8 @@ from .helpers import DatasetPopulator
from .helpers import DatasetCollectionPopulator
from .helpers import skip_without_tool
from base.interactor import delete_request # requests like delete
from requests import delete
from galaxy.exceptions import error_codes
@@ -40,7 +41,7 @@ class WorkflowsApiTestCase( api.ApiTestCase ):
workflow_name = "test_delete (imported from API)"
self._assert_user_has_workflow_with_name( workflow_name )
workflow_url = self._api_url( "workflows/%s" % workflow_id, use_key=True )
delete_response = delete_request( workflow_url )
delete_response = delete( workflow_url )
self._assert_status_code_is( delete_response, 200 )
# Make sure workflow is no longer in index by default.
assert workflow_name not in self.__workflow_names()
@@ -49,7 +50,7 @@ class WorkflowsApiTestCase( api.ApiTestCase ):
workflow_id = self.workflow_populator.simple_workflow( "test_other_delete" )
with self._different_user():
workflow_url = self._api_url( "workflows/%s" % workflow_id, use_key=True )
delete_response = delete_request( workflow_url )
delete_response = delete( workflow_url )
self._assert_status_code_is( delete_response, 403 )
def test_index( self ):
test/base/interactor.py
+5 -9
View File
@@ -10,7 +10,9 @@ from galaxy.util.odict import odict
import galaxy.model
from galaxy.model.orm import and_, desc
from functional import database_contexts
from json import dumps, loads
from requests import get
from requests import post
from json import dumps
from logging import getLogger
log = getLogger( __name__ )
@@ -366,7 +368,7 @@ class GalaxyInteractorApi( object ):
key = self.api_key if not admin else self.master_api_key
data = data.copy()
data['key'] = key
return post_request( "%s/%s" % (self.api_url, path), data=data, files=files )
return post( "%s/%s" % (self.api_url, path), data=data, files=files )
def _get( self, path, data={}, key=None, admin=False ):
if not key:
@@ -376,7 +378,7 @@ class GalaxyInteractorApi( object ):
if path.startswith("/api"):
path = path[ len("/api"): ]
url = "%s/%s" % (self.api_url, path)
return get_request( url, params=data )
return get( url, params=data )
class GalaxyInteractorTwill( object ):
@@ -496,9 +498,3 @@ GALAXY_INTERACTORS = {
'api': GalaxyInteractorApi,
'twill': GalaxyInteractorTwill,
}
from requests import get as get_request
from requests import post as post_request
from requests import put as put_request
from requests import delete as delete_request