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

Fix all E201 and E202 style errors

Browse Source 
using the following command:
```
autopep8 -i -r --exclude $(sed -e 's|^|./|' -e 's|/$||' .ci/flake8_blacklist.txt | paste -sd,) --select E201,E202 .
```
This commit is contained in:
Nicola Soranzo
2017-08-17 11:35:39 +01:00
committed by Nicola Soranzo
parent 008a1d849c
commit 21b44bf348
1062 changed files with 69958 additions and 69959 deletions
Download Patch File Download Diff File Expand all files Collapse all files
test/api/test_api_batch.py
+42 -42
View File
@@ -5,75 +5,75 @@ from requests import post
from base import api
class ApiBatchTestCase( api.ApiTestCase ):
class ApiBatchTestCase(api.ApiTestCase):
def _get_api_key( self, admin=False ):
def _get_api_key(self, admin=False):
return self.galaxy_interactor.api_key if not admin else self.galaxy_interactor.master_api_key
def _with_key( self, url, admin=False ):
def _with_key(self, url, admin=False):
sep = '&' if '?' in url else '?'
return url + sep + 'key=' + self._get_api_key( admin=admin )
return url + sep + 'key=' + self._get_api_key(admin=admin)
def _post_batch( self, batch ):
data = json.dumps({ "batch" : batch })
return post( "%s/batch" % ( self.galaxy_interactor.api_url ), data=data )
def _post_batch(self, batch):
data = json.dumps({"batch" : batch})
return post("%s/batch" % (self.galaxy_interactor.api_url), data=data)
# ---- tests
def test_simple_array( self ):
def test_simple_array(self):
batch = [
dict( url=self._with_key( '/api/histories' ) ),
dict( url=self._with_key( '/api/histories' ),
method='POST', body=json.dumps( dict( name='Wat' ) ) ),
dict( url=self._with_key( '/api/histories' ) ),
dict(url=self._with_key('/api/histories')),
dict(url=self._with_key('/api/histories'),
method='POST', body=json.dumps(dict(name='Wat'))),
dict(url=self._with_key('/api/histories')),
]
response = self._post_batch( batch )
response = self._post_batch(batch)
response = response.json()
self.assertIsInstance( response, list )
self.assertEquals( len( response ), 3 )
self.assertIsInstance(response, list)
self.assertEquals(len(response), 3)
def test_unallowed_route( self ):
def test_unallowed_route(self):
batch = [
dict( url=self._with_key( '/api/workflow' ) )
dict(url=self._with_key('/api/workflow'))
]
response = self._post_batch( batch )
response = self._post_batch(batch)
response = response.json()
self.assertIsInstance( response, list )
self.assertEquals( response[0][ 'status' ], 403 )
self.assertIsInstance(response, list)
self.assertEquals(response[0]['status'], 403)
def test_404_route( self ):
def test_404_route(self):
# needs to be within the allowed routes
batch = [
dict( url=self._with_key( '/api/histories_bler' ) )
dict(url=self._with_key('/api/histories_bler'))
]
response = self._post_batch( batch )
response = self._post_batch(batch)
response = response.json()
self.assertIsInstance( response, list )
self.assertEquals( response[0][ 'status' ], 404 )
self.assertIsInstance(response, list)
self.assertEquals(response[0]['status'], 404)
def test_errors( self ):
def test_errors(self):
batch = [
dict( url=self._with_key( '/api/histories/abc123' ) ),
dict( url=self._with_key( '/api/jobs' ), method='POST', body=json.dumps( dict( name='Wat' ) ) ),
dict(url=self._with_key('/api/histories/abc123')),
dict(url=self._with_key('/api/jobs'), method='POST', body=json.dumps(dict(name='Wat'))),
]
response = self._post_batch( batch )
response = self._post_batch(batch)
response = response.json()
self.assertIsInstance( response, list )
self.assertEquals( response[0][ 'status' ], 400 )
self.assertEquals( response[1][ 'status' ], 501 )
self.assertIsInstance(response, list)
self.assertEquals(response[0]['status'], 400)
self.assertEquals(response[1]['status'], 501)
def test_querystring_params( self ):
post_data = dict( name='test' )
create_response = self._post( 'histories', data=post_data ).json()
def test_querystring_params(self):
post_data = dict(name='test')
create_response = self._post('histories', data=post_data).json()
history_url = '/api/histories/' + create_response[ 'id' ]
history_url = '/api/histories/' + create_response['id']
history_url_with_keys = history_url + '?v=dev&keys=size,non_ready_jobs'
contents_url_with_filters = history_url + '/contents?v=dev&q=deleted&qv=True'
batch = [
dict( url=self._with_key( history_url_with_keys ) ),
dict( url=self._with_key( contents_url_with_filters ) ),
dict(url=self._with_key(history_url_with_keys)),
dict(url=self._with_key(contents_url_with_filters)),
]
response = self._post_batch( batch )
response = self._post_batch(batch)
response = response.json()
self.assertEquals( len( response ), 2 )
self.assertEquals( len( response[0][ 'body' ].keys() ), 2 )
self.assertEquals( response[1][ 'body' ], [] )
self.assertEquals(len(response), 2)
self.assertEquals(len(response[0]['body'].keys()), 2)
self.assertEquals(response[1]['body'], [])