Skip to content

Commit f85f805

Browse files
author
Peter Amstutz
committed
Passing some tests
1 parent 0d6df34 commit f85f805

File tree

2 files changed

+5
-5
lines changed

2 files changed

+5
-5
lines changed

setup.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
long_description = readmeFile.read()
1212

1313
setup(name='wes-service',
14-
version='2.4',
14+
version='2.5',
1515
description='GA4GH Workflow Execution Service reference implementation',
1616
long_description=long_description,
1717
author='GA4GH Containers and Workflows task team',

test/test_integration.py

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@ def test_multipart_upload(self):
6060

6161
def run_md5sum(cwl_input):
6262
"""Pass a local md5sum cwl to the wes-service server, and return the path of the output file that was created."""
63-
endpoint = 'http://localhost:8080/ga4gh/wes/v1/workflows'
63+
endpoint = 'http://localhost:8080/ga4gh/wes/v1/runs'
6464
params = {'output_file': {'path': '/tmp/md5sum.txt', 'class': 'File'},
6565
'input_file': {'path': '../../testdata/md5sum.input', 'class': 'File'}}
6666

@@ -71,12 +71,12 @@ def run_md5sum(cwl_input):
7171
else:
7272
parts.append(("workflow_url", cwl_input))
7373
response = requests.post(endpoint, files=parts).json()
74-
output_dir = os.path.abspath(os.path.join('workflows', response['workflow_id'], 'outdir'))
75-
return os.path.join(output_dir, 'md5sum.txt'), response['workflow_id']
74+
output_dir = os.path.abspath(os.path.join('workflows', response['run_id'], 'outdir'))
75+
return os.path.join(output_dir, 'md5sum.txt'), response['run_id']
7676

7777

7878
def get_log_request(run_id):
79-
endpoint = 'http://localhost:8080/ga4gh/wes/v1/workflows/{}'.format(run_id)
79+
endpoint = 'http://localhost:8080/ga4gh/wes/v1/runs/{}'.format(run_id)
8080
return requests.get(endpoint).json()
8181

8282

0 commit comments

Comments
 (0)