From 8b91b0ac9310b4e1956ecc793a6247fac115fe15 Mon Sep 17 00:00:00 2001 From: Scott Chamberlain Date: Tue, 13 Aug 2024 09:51:03 -0700 Subject: [PATCH] re-record fixtures --- tests/fixtures/cromwell_abort.yml | 20 ++++---- tests/fixtures/cromwell_backends.yml | 18 +++---- tests/fixtures/cromwell_cache.yml | 27 ++++------ tests/fixtures/cromwell_cache_http.yml | 15 +++--- tests/fixtures/cromwell_cache_http_prep.yml | 9 ++-- tests/fixtures/cromwell_cache_prep.yml | 25 ++++----- tests/fixtures/cromwell_call.yml | 13 +++-- tests/fixtures/cromwell_call_prep.yml | 9 ++-- tests/fixtures/cromwell_failures.yml | 11 ++-- tests/fixtures/cromwell_failures_prep.yml | 9 ++-- tests/fixtures/cromwell_glob.yml | 51 ++++++++----------- tests/fixtures/cromwell_glob_expanded.yml | 26 ++++------ tests/fixtures/cromwell_jobs.yml | 13 +++-- tests/fixtures/cromwell_labels_data.yml | 20 +++----- tests/fixtures/cromwell_labels_submit.yml | 24 +++------ tests/fixtures/cromwell_logs_after.yml | 11 ++-- tests/fixtures/cromwell_logs_before.yml | 20 ++++---- tests/fixtures/cromwell_outputs.yml | 11 ++-- tests/fixtures/cromwell_outputs_prep.yml | 9 ++-- tests/fixtures/cromwell_submit_batch.yml | 25 ++++----- tests/fixtures/cromwell_submit_batch_http.yml | 25 ++++----- ...cromwell_submit_batch_workflow_options.yml | 9 ++-- tests/fixtures/cromwell_validate.yml | 7 ++- tests/fixtures/cromwell_workflow.yml | 13 +++-- tests/fixtures/cromwell_workflow_http.yml | 13 +++-- tests/fixtures/cromwell_workflow_prep.yml | 9 ++-- tests/testthat/test-cromwell_glob.R | 2 +- 27 files changed, 184 insertions(+), 260 deletions(-) diff --git a/tests/fixtures/cromwell_abort.yml b/tests/fixtures/cromwell_abort.yml index 325b01b..6f710d1 100644 --- a/tests/fixtures/cromwell_abort.yml +++ b/tests/fixtures/cromwell_abort.yml @@ -11,19 +11,18 @@ http_interactions: status_code: 201 message: Created headers: - Server: akka-http/10.1.15 - Date: Mon, 15 Jul 2024 22:01:08 GMT + Date: Fri, 09 Aug 2024 23:00:08 GMT Content-Type: application/json Content-Length: '66' body: encoding: '' file: no - string: '{"id":"900e031d-bf5d-4a97-b516-7962ee9b8ad3","status":"Submitted"}' - recorded_at: 2024-07-15 22:01:28 GMT - recorded_with: vcr/1.2.2.93, webmockr/0.9.1.91 + string: '{"id":"97c27bcb-e724-4e42-bd8c-abc402af489f","status":"Submitted"}' + recorded_at: 2024-08-09 23:00:28 GMT + recorded_with: vcr/1.6.0, webmockr/1.0.0 - request: method: post - uri: http://localhost:8000/api/workflows/v1/900e031d-bf5d-4a97-b516-7962ee9b8ad3/abort + uri: http://localhost:8000/api/workflows/v1/97c27bcb-e724-4e42-bd8c-abc402af489f/abort body: encoding: '' string: '' @@ -33,13 +32,12 @@ http_interactions: status_code: 200 message: OK headers: - Server: akka-http/10.1.15 - Date: Mon, 15 Jul 2024 22:01:28 GMT + Date: Fri, 09 Aug 2024 23:00:28 GMT Content-Type: application/json Content-Length: '65' body: encoding: '' file: no - string: '{"id":"900e031d-bf5d-4a97-b516-7962ee9b8ad3","status":"Aborting"}' - recorded_at: 2024-07-15 22:01:28 GMT - recorded_with: vcr/1.2.2.93, webmockr/0.9.1.91 + string: '{"id":"97c27bcb-e724-4e42-bd8c-abc402af489f","status":"Aborting"}' + recorded_at: 2024-08-09 23:00:28 GMT + recorded_with: vcr/1.6.0, webmockr/1.0.0 diff --git a/tests/fixtures/cromwell_backends.yml b/tests/fixtures/cromwell_backends.yml index 990f296..a7bedc1 100644 --- a/tests/fixtures/cromwell_backends.yml +++ b/tests/fixtures/cromwell_backends.yml @@ -5,22 +5,18 @@ http_interactions: body: encoding: '' string: '' - headers: - Accept: application/json, text/xml, application/xml, */* + headers: [] response: status: status_code: 200 - category: Success - reason: OK - message: 'Success: (200) OK' + message: OK headers: - server: akka-http/10.1.15 - date: Fri, 05 Jan 2024 16:36:47 GMT - content-type: application/json - content-length: '56' + Date: Fri, 09 Aug 2024 23:01:10 GMT + Content-Type: application/json + Content-Length: '56' body: encoding: '' file: no string: '{"defaultBackend":"Local","supportedBackends":["Local"]}' - recorded_at: 2024-01-05 16:36:47 GMT - recorded_with: vcr/1.2.2.91, webmockr/0.9.0 + recorded_at: 2024-08-09 23:01:10 GMT + recorded_with: vcr/1.6.0, webmockr/1.0.0 diff --git a/tests/fixtures/cromwell_cache.yml b/tests/fixtures/cromwell_cache.yml index c4c798a..7d1157c 100644 --- a/tests/fixtures/cromwell_cache.yml +++ b/tests/fixtures/cromwell_cache.yml @@ -1,30 +1,25 @@ http_interactions: - request: method: get - uri: http://localhost:8000/api/workflows/v1/e45a30ed-3674-4ac4-96ba-dc3985aa469d/metadata?expandSubWorkflows=false + uri: http://localhost:8000/api/workflows/v1/0807875b-91cc-4bf1-81ad-69eac301a053/metadata?expandSubWorkflows=false body: encoding: '' string: '' - headers: - Accept: application/json, text/xml, application/xml, */* + headers: [] response: status: status_code: 200 - category: Success - reason: OK - message: 'Success: (200) OK' + message: OK headers: - content-encoding: gzip - server: akka-http/10.1.15 - date: Fri, 05 Jan 2024 16:37:25 GMT - transfer-encoding: chunked - content-type: application/json + Content-Encoding: gzip + Date: Fri, 09 Aug 2024 23:02:43 GMT + Transfer-Encoding: chunked + Content-Type: application/json body: encoding: '' file: no - string: '{"workflowName":"test","workflowProcessingEvents":[{"cromwellId":"cromid-04c89b5","description":"PickedUp","timestamp":"2024-01-05T16:37:17.011Z","cromwellVersion":"86"}],"actualWorkflowLanguageVersion":"draft-2","submittedFiles":{"workflow":"task + string: '{"workflowName":"test","workflowProcessingEvents":[{"cromwellId":"cromid-909b41f","description":"PickedUp","timestamp":"2024-08-09T23:02:31.246Z","cromwellVersion":"87"}],"actualWorkflowLanguageVersion":"draft-2","submittedFiles":{"workflow":"task hello {\n String name\n\n command {\n echo ''Hello ${name}!''\n }\n output - {\n File response = stdout()\n }\n}\n\nworkflow test {\n call hello\n}\n\n","root":"","options":"{\n\n}","inputs":"{\"test.hello.name\":\"World\"}","workflowUrl":"","labels":"{}"},"calls":{"test.hello":[{"executionStatus":"Running","stdout":"/Users/schambe3/github/cromwell/cromwell-executions/test/e45a30ed-3674-4ac4-96ba-dc3985aa469d/call-hello/execution/stdout","commandLine":"echo - ''Hello World!''","shardIndex":-1,"runtimeAttributes":{"maxRetries":"0","failOnStderr":"false","continueOnReturnCode":"0"},"callCaching":{"allowResultReuse":false,"effectiveCallCachingMode":"CallCachingOff"},"inputs":{"name":"World"},"backend":"Local","attempt":1,"start":"2024-01-05T16:37:18.053Z","stderr":"/Users/schambe3/github/cromwell/cromwell-executions/test/e45a30ed-3674-4ac4-96ba-dc3985aa469d/call-hello/execution/stderr","callRoot":"/Users/schambe3/github/cromwell/cromwell-executions/test/e45a30ed-3674-4ac4-96ba-dc3985aa469d/call-hello"}]},"outputs":{},"workflowRoot":"/Users/schambe3/github/cromwell/cromwell-executions/test/e45a30ed-3674-4ac4-96ba-dc3985aa469d","actualWorkflowLanguage":"WDL","status":"Running","start":"2024-01-05T16:37:17.012Z","id":"e45a30ed-3674-4ac4-96ba-dc3985aa469d","inputs":{"test.hello.name":"World"},"labels":{"cromwell-workflow-id":"cromwell-e45a30ed-3674-4ac4-96ba-dc3985aa469d"},"submission":"2024-01-05T16:36:55.936Z"}' - recorded_at: 2024-01-05 16:37:26 GMT - recorded_with: vcr/1.2.2.91, webmockr/0.9.0 + {\n File response = stdout()\n }\n}\n\nworkflow test {\n call hello\n}\n\n","root":"","options":"{\n\n}","inputs":"{\"test.hello.name\":\"World\"}","workflowUrl":"","labels":"{}"},"calls":{"test.hello":[{"executionStatus":"QueuedInCromwell","shardIndex":-1,"backend":"Local","attempt":1,"start":"2024-08-09T23:02:32.288Z"}]},"outputs":{},"workflowRoot":"/Users/schambe3/github/cromwell/cromwell-executions/test/0807875b-91cc-4bf1-81ad-69eac301a053","actualWorkflowLanguage":"WDL","status":"Running","start":"2024-08-09T23:02:31.248Z","id":"0807875b-91cc-4bf1-81ad-69eac301a053","inputs":{"test.hello.name":"World"},"labels":{"cromwell-workflow-id":"cromwell-0807875b-91cc-4bf1-81ad-69eac301a053"},"submission":"2024-08-09T23:02:13.298Z"}' + recorded_at: 2024-08-09 23:02:43 GMT + recorded_with: vcr/1.6.0, webmockr/1.0.0 diff --git a/tests/fixtures/cromwell_cache_http.yml b/tests/fixtures/cromwell_cache_http.yml index ee84f70..a716db1 100644 --- a/tests/fixtures/cromwell_cache_http.yml +++ b/tests/fixtures/cromwell_cache_http.yml @@ -1,7 +1,7 @@ http_interactions: - request: method: get - uri: http://localhost:8000/api/workflows/v1/303243c4-c30f-4269-978b-c7964b066abe/metadata?expandSubWorkflows=false + uri: http://localhost:8000/api/workflows/v1/1d4bd515-7696-4062-a516-d1c6ad792785/metadata?expandSubWorkflows=false body: encoding: '' string: '' @@ -12,16 +12,15 @@ http_interactions: message: OK headers: Content-Encoding: gzip - Server: akka-http/10.1.15 - Date: Mon, 15 Jul 2024 22:07:39 GMT + Date: Fri, 09 Aug 2024 23:02:13 GMT Transfer-Encoding: chunked Content-Type: application/json body: encoding: '' file: no - string: '{"workflowName":"test","workflowProcessingEvents":[{"cromwellId":"cromid-d1d4e5c","description":"Finished","timestamp":"2024-07-15T22:07:26.758Z","cromwellVersion":"86"},{"cromwellId":"cromid-d1d4e5c","description":"PickedUp","timestamp":"2024-07-15T22:07:12.455Z","cromwellVersion":"86"}],"actualWorkflowLanguageVersion":"draft-2","submittedFiles":{"workflow":"task + string: '{"workflowName":"test","workflowProcessingEvents":[{"cromwellId":"cromid-909b41f","description":"PickedUp","timestamp":"2024-08-09T23:01:51.184Z","cromwellVersion":"87"},{"cromwellId":"cromid-909b41f","description":"Finished","timestamp":"2024-08-09T23:02:08.553Z","cromwellVersion":"87"}],"actualWorkflowLanguageVersion":"draft-2","submittedFiles":{"workflow":"task hello {\n String name\n\n command {\n echo ''Hello ${name}!''\n }\n output - {\n File response = stdout()\n }\n}\n\nworkflow test {\n call hello\n}\n\n","root":"","options":"{\n\n}","inputs":"{\"test.hello.name\":\"World\"}","workflowUrl":"","labels":"{}"},"calls":{"test.hello":[{"executionStatus":"Done","stdout":"/Users/schambe3/github/cromwell/cromwell-executions/test/303243c4-c30f-4269-978b-c7964b066abe/call-hello/execution/stdout","backendStatus":"Done","commandLine":"echo - ''Hello World!''","shardIndex":-1,"outputs":{"response":"/Users/schambe3/github/cromwell/cromwell-executions/test/303243c4-c30f-4269-978b-c7964b066abe/call-hello/execution/stdout"},"runtimeAttributes":{"maxRetries":"0","failOnStderr":"false","continueOnReturnCode":"0"},"callCaching":{"allowResultReuse":false,"effectiveCallCachingMode":"CallCachingOff"},"inputs":{"name":"World"},"returnCode":0,"jobId":"92646","backend":"Local","end":"2024-07-15T22:07:25.065Z","start":"2024-07-15T22:07:13.495Z","stderr":"/Users/schambe3/github/cromwell/cromwell-executions/test/303243c4-c30f-4269-978b-c7964b066abe/call-hello/execution/stderr","callRoot":"/Users/schambe3/github/cromwell/cromwell-executions/test/303243c4-c30f-4269-978b-c7964b066abe/call-hello","attempt":1,"executionEvents":[{"startTime":"2024-07-15T22:07:13.496Z","description":"RequestingExecutionToken","endTime":"2024-07-15T22:07:20.333Z"},{"startTime":"2024-07-15T22:07:25.042Z","description":"UpdatingJobStore","endTime":"2024-07-15T22:07:25.065Z"},{"startTime":"2024-07-15T22:07:13.495Z","description":"Pending","endTime":"2024-07-15T22:07:13.496Z"},{"startTime":"2024-07-15T22:07:20.333Z","description":"PreparingJob","endTime":"2024-07-15T22:07:20.337Z"},{"startTime":"2024-07-15T22:07:20.333Z","description":"WaitingForValueStore","endTime":"2024-07-15T22:07:20.333Z"},{"startTime":"2024-07-15T22:07:20.337Z","description":"RunningJob","endTime":"2024-07-15T22:07:25.042Z"}]}]},"outputs":{"test.hello.response":"/Users/schambe3/github/cromwell/cromwell-executions/test/303243c4-c30f-4269-978b-c7964b066abe/call-hello/execution/stdout"},"workflowRoot":"/Users/schambe3/github/cromwell/cromwell-executions/test/303243c4-c30f-4269-978b-c7964b066abe","actualWorkflowLanguage":"WDL","status":"Succeeded","end":"2024-07-15T22:07:26.758Z","start":"2024-07-15T22:07:12.456Z","id":"303243c4-c30f-4269-978b-c7964b066abe","inputs":{"test.hello.name":"World"},"labels":{"cromwell-workflow-id":"cromwell-303243c4-c30f-4269-978b-c7964b066abe"},"submission":"2024-07-15T22:07:09.411Z"}' - recorded_at: 2024-07-15 22:07:39 GMT - recorded_with: vcr/1.2.2.93, webmockr/0.9.1.91 + {\n File response = stdout()\n }\n}\n\nworkflow test {\n call hello\n}\n\n","root":"","options":"{\n\n}","inputs":"{\"test.hello.name\":\"World\"}","workflowUrl":"","labels":"{}"},"calls":{"test.hello":[{"executionStatus":"Done","stdout":"/Users/schambe3/github/cromwell/cromwell-executions/test/1d4bd515-7696-4062-a516-d1c6ad792785/call-hello/execution/stdout","backendStatus":"Done","commandLine":"echo + ''Hello World!''","shardIndex":-1,"outputs":{"response":"/Users/schambe3/github/cromwell/cromwell-executions/test/1d4bd515-7696-4062-a516-d1c6ad792785/call-hello/execution/stdout"},"runtimeAttributes":{"maxRetries":"0","failOnStderr":"false","continueOnReturnCode":"0"},"callCaching":{"allowResultReuse":false,"effectiveCallCachingMode":"CallCachingOff"},"inputs":{"name":"World"},"returnCode":0,"jobId":"84322","backend":"Local","end":"2024-08-09T23:02:06.532Z","start":"2024-08-09T23:01:52.229Z","stderr":"/Users/schambe3/github/cromwell/cromwell-executions/test/1d4bd515-7696-4062-a516-d1c6ad792785/call-hello/execution/stderr","callRoot":"/Users/schambe3/github/cromwell/cromwell-executions/test/1d4bd515-7696-4062-a516-d1c6ad792785/call-hello","attempt":1,"executionEvents":[{"startTime":"2024-08-09T23:02:05.542Z","description":"UpdatingJobStore","endTime":"2024-08-09T23:02:06.532Z"},{"startTime":"2024-08-09T23:01:52.231Z","description":"RequestingExecutionToken","endTime":"2024-08-09T23:02:00.787Z"},{"startTime":"2024-08-09T23:02:00.789Z","description":"PreparingJob","endTime":"2024-08-09T23:02:00.795Z"},{"startTime":"2024-08-09T23:01:52.230Z","description":"Pending","endTime":"2024-08-09T23:01:52.231Z"},{"startTime":"2024-08-09T23:02:00.795Z","description":"RunningJob","endTime":"2024-08-09T23:02:05.542Z"},{"startTime":"2024-08-09T23:02:00.787Z","description":"WaitingForValueStore","endTime":"2024-08-09T23:02:00.789Z"}]}]},"outputs":{"test.hello.response":"/Users/schambe3/github/cromwell/cromwell-executions/test/1d4bd515-7696-4062-a516-d1c6ad792785/call-hello/execution/stdout"},"workflowRoot":"/Users/schambe3/github/cromwell/cromwell-executions/test/1d4bd515-7696-4062-a516-d1c6ad792785","actualWorkflowLanguage":"WDL","status":"Succeeded","end":"2024-08-09T23:02:08.552Z","start":"2024-08-09T23:01:51.187Z","id":"1d4bd515-7696-4062-a516-d1c6ad792785","inputs":{"test.hello.name":"World"},"labels":{"cromwell-workflow-id":"cromwell-1d4bd515-7696-4062-a516-d1c6ad792785"},"submission":"2024-08-09T23:01:43.103Z"}' + recorded_at: 2024-08-09 23:02:13 GMT + recorded_with: vcr/1.6.0, webmockr/1.0.0 diff --git a/tests/fixtures/cromwell_cache_http_prep.yml b/tests/fixtures/cromwell_cache_http_prep.yml index 81aeac7..62cb03b 100644 --- a/tests/fixtures/cromwell_cache_http_prep.yml +++ b/tests/fixtures/cromwell_cache_http_prep.yml @@ -11,13 +11,12 @@ http_interactions: status_code: 201 message: Created headers: - Server: akka-http/10.1.15 - Date: Mon, 15 Jul 2024 22:07:09 GMT + Date: Fri, 09 Aug 2024 23:01:43 GMT Content-Type: application/json Content-Length: '66' body: encoding: '' file: no - string: '{"id":"303243c4-c30f-4269-978b-c7964b066abe","status":"Submitted"}' - recorded_at: 2024-07-15 22:07:09 GMT - recorded_with: vcr/1.2.2.93, webmockr/0.9.1.91 + string: '{"id":"1d4bd515-7696-4062-a516-d1c6ad792785","status":"Submitted"}' + recorded_at: 2024-08-09 23:01:43 GMT + recorded_with: vcr/1.6.0, webmockr/1.0.0 diff --git a/tests/fixtures/cromwell_cache_prep.yml b/tests/fixtures/cromwell_cache_prep.yml index 7040a7c..9ab90c3 100644 --- a/tests/fixtures/cromwell_cache_prep.yml +++ b/tests/fixtures/cromwell_cache_prep.yml @@ -4,26 +4,19 @@ http_interactions: uri: http://localhost:8000/api/workflows/v1 body: encoding: '' - string: workflowSource=list(path = "/Users/schambe3/github/getwilds/rcromwell/inst/examples/hello.wdl", - type = "application/octet-stream", name = NULL),workflowInputs=list(path = - "/Users/schambe3/github/getwilds/rcromwell/inst/examples/inputs.json", type - = "application/json", name = NULL) - headers: - Accept: application/json, text/xml, application/xml, */* + string: '' + headers: [] response: status: status_code: 201 - category: Success - reason: Created - message: 'Success: (201) Created' + message: Created headers: - server: akka-http/10.1.15 - date: Fri, 05 Jan 2024 16:36:55 GMT - content-type: application/json - content-length: '66' + Date: Fri, 09 Aug 2024 23:02:13 GMT + Content-Type: application/json + Content-Length: '66' body: encoding: '' file: no - string: '{"id":"e45a30ed-3674-4ac4-96ba-dc3985aa469d","status":"Submitted"}' - recorded_at: 2024-01-05 16:36:55 GMT - recorded_with: vcr/1.2.2.91, webmockr/0.9.0 + string: '{"id":"0807875b-91cc-4bf1-81ad-69eac301a053","status":"Submitted"}' + recorded_at: 2024-08-09 23:02:13 GMT + recorded_with: vcr/1.6.0, webmockr/1.0.0 diff --git a/tests/fixtures/cromwell_call.yml b/tests/fixtures/cromwell_call.yml index d214439..f92dbb2 100644 --- a/tests/fixtures/cromwell_call.yml +++ b/tests/fixtures/cromwell_call.yml @@ -1,7 +1,7 @@ http_interactions: - request: method: get - uri: http://localhost:8000/api/workflows/v1/bb9fbeb6-652c-4349-bc76-4c9a165b22a5/metadata?expandSubWorkflows=true + uri: http://localhost:8000/api/workflows/v1/c05a0de4-1a6c-4ee7-bf33-d35c077cf5c3/metadata?expandSubWorkflows=true body: encoding: '' string: '' @@ -12,15 +12,14 @@ http_interactions: message: OK headers: Content-Encoding: gzip - Server: akka-http/10.1.15 - Date: Mon, 15 Jul 2024 22:20:44 GMT + Date: Fri, 09 Aug 2024 23:06:24 GMT Transfer-Encoding: chunked Content-Type: application/json body: encoding: '' file: no - string: '{"workflowName":"test","workflowProcessingEvents":[{"cromwellId":"cromid-d1d4e5c","description":"PickedUp","timestamp":"2024-07-15T22:20:33.361Z","cromwellVersion":"86"}],"actualWorkflowLanguageVersion":"draft-2","submittedFiles":{"workflow":"task + string: '{"workflowName":"test","workflowProcessingEvents":[{"cromwellId":"cromid-909b41f","description":"PickedUp","timestamp":"2024-08-09T23:06:11.562Z","cromwellVersion":"87"}],"actualWorkflowLanguageVersion":"draft-2","submittedFiles":{"workflow":"task hello {\n String name\n\n command {\n echo ''Hello ${name}!''\n }\n output - {\n File response = stdout()\n }\n}\n\nworkflow test {\n call hello\n}\n\n","root":"","options":"{\n\n}","inputs":"{\"test.hello.name\":\"World\"}","workflowUrl":"","labels":"{}"},"calls":{"test.hello":[{"executionStatus":"QueuedInCromwell","shardIndex":-1,"backend":"Local","attempt":1,"start":"2024-07-15T22:20:34.410Z"}]},"outputs":{},"workflowRoot":"/Users/schambe3/github/cromwell/cromwell-executions/test/bb9fbeb6-652c-4349-bc76-4c9a165b22a5","actualWorkflowLanguage":"WDL","status":"Running","start":"2024-07-15T22:20:33.364Z","id":"bb9fbeb6-652c-4349-bc76-4c9a165b22a5","inputs":{"test.hello.name":"World"},"labels":{"cromwell-workflow-id":"cromwell-bb9fbeb6-652c-4349-bc76-4c9a165b22a5"},"submission":"2024-07-15T22:20:14.285Z"}' - recorded_at: 2024-07-15 22:20:44 GMT - recorded_with: vcr/1.2.2.93, webmockr/0.9.1.91 + {\n File response = stdout()\n }\n}\n\nworkflow test {\n call hello\n}\n\n","root":"","options":"{\n\n}","inputs":"{\"test.hello.name\":\"World\"}","workflowUrl":"","labels":"{}"},"calls":{"test.hello":[{"executionStatus":"QueuedInCromwell","shardIndex":-1,"backend":"Local","attempt":1,"start":"2024-08-09T23:06:12.609Z"}]},"outputs":{},"workflowRoot":"/Users/schambe3/github/cromwell/cromwell-executions/test/c05a0de4-1a6c-4ee7-bf33-d35c077cf5c3","actualWorkflowLanguage":"WDL","status":"Running","start":"2024-08-09T23:06:11.564Z","id":"c05a0de4-1a6c-4ee7-bf33-d35c077cf5c3","inputs":{"test.hello.name":"World"},"labels":{"cromwell-workflow-id":"cromwell-c05a0de4-1a6c-4ee7-bf33-d35c077cf5c3"},"submission":"2024-08-09T23:05:54.776Z"}' + recorded_at: 2024-08-09 23:06:24 GMT + recorded_with: vcr/1.6.0, webmockr/1.0.0 diff --git a/tests/fixtures/cromwell_call_prep.yml b/tests/fixtures/cromwell_call_prep.yml index 983e790..733d5e8 100644 --- a/tests/fixtures/cromwell_call_prep.yml +++ b/tests/fixtures/cromwell_call_prep.yml @@ -11,13 +11,12 @@ http_interactions: status_code: 201 message: Created headers: - Server: akka-http/10.1.15 - Date: Mon, 15 Jul 2024 22:20:14 GMT + Date: Fri, 09 Aug 2024 23:05:54 GMT Content-Type: application/json Content-Length: '66' body: encoding: '' file: no - string: '{"id":"bb9fbeb6-652c-4349-bc76-4c9a165b22a5","status":"Submitted"}' - recorded_at: 2024-07-15 22:20:14 GMT - recorded_with: vcr/1.2.2.93, webmockr/0.9.1.91 + string: '{"id":"c05a0de4-1a6c-4ee7-bf33-d35c077cf5c3","status":"Submitted"}' + recorded_at: 2024-08-09 23:05:54 GMT + recorded_with: vcr/1.6.0, webmockr/1.0.0 diff --git a/tests/fixtures/cromwell_failures.yml b/tests/fixtures/cromwell_failures.yml index 9631ea9..f3fff59 100644 --- a/tests/fixtures/cromwell_failures.yml +++ b/tests/fixtures/cromwell_failures.yml @@ -1,7 +1,7 @@ http_interactions: - request: method: get - uri: http://localhost:8000/api/workflows/v1/b8eb2edf-742a-40b4-9f49-4ea89cd857e1/metadata?includeKey=failures&includeKey=jobId + uri: http://localhost:8000/api/workflows/v1/c4a6e761-2376-4633-8e53-9ca554f28193/metadata?includeKey=failures&includeKey=jobId body: encoding: '' string: '' @@ -12,8 +12,7 @@ http_interactions: message: OK headers: Content-Encoding: gzip - Server: akka-http/10.1.15 - Date: Mon, 15 Jul 2024 22:11:30 GMT + Date: Fri, 09 Aug 2024 23:37:15 GMT Transfer-Encoding: chunked Content-Type: application/json body: @@ -21,6 +20,6 @@ http_interactions: file: no string: '{"failures":[{"causedBy":[{"causedBy":[],"message":"Required workflow input ''test.hello.name'' not specified"}],"message":"Workflow input processing - failed"}],"calls":{},"id":"b8eb2edf-742a-40b4-9f49-4ea89cd857e1"}' - recorded_at: 2024-07-15 22:11:30 GMT - recorded_with: vcr/1.2.2.93, webmockr/0.9.1.91 + failed"}],"calls":{},"id":"c4a6e761-2376-4633-8e53-9ca554f28193"}' + recorded_at: 2024-08-09 23:37:15 GMT + recorded_with: vcr/1.6.0, webmockr/1.0.0 diff --git a/tests/fixtures/cromwell_failures_prep.yml b/tests/fixtures/cromwell_failures_prep.yml index fdb978a..df125b5 100644 --- a/tests/fixtures/cromwell_failures_prep.yml +++ b/tests/fixtures/cromwell_failures_prep.yml @@ -11,13 +11,12 @@ http_interactions: status_code: 201 message: Created headers: - Server: akka-http/10.1.15 - Date: Mon, 15 Jul 2024 22:11:00 GMT + Date: Fri, 09 Aug 2024 23:36:44 GMT Content-Type: application/json Content-Length: '66' body: encoding: '' file: no - string: '{"id":"b8eb2edf-742a-40b4-9f49-4ea89cd857e1","status":"Submitted"}' - recorded_at: 2024-07-15 22:11:00 GMT - recorded_with: vcr/1.2.2.93, webmockr/0.9.1.91 + string: '{"id":"c4a6e761-2376-4633-8e53-9ca554f28193","status":"Submitted"}' + recorded_at: 2024-08-09 23:36:45 GMT + recorded_with: vcr/1.6.0, webmockr/1.0.0 diff --git a/tests/fixtures/cromwell_glob.yml b/tests/fixtures/cromwell_glob.yml index 8bc0371..fb95022 100644 --- a/tests/fixtures/cromwell_glob.yml +++ b/tests/fixtures/cromwell_glob.yml @@ -4,54 +4,43 @@ http_interactions: uri: http://localhost:8000/api/workflows/v1 body: encoding: '' - string: workflowSource=list(path = "/Users/schambe3/github/getwilds/rcromwell/inst/examples/hello.wdl", - type = "application/octet-stream", name = NULL),workflowInputs=list(path = - "/Users/schambe3/github/getwilds/rcromwell/inst/examples/inputs.json", type - = "application/json", name = NULL) - headers: - Accept: application/json, text/xml, application/xml, */* + string: '' + headers: [] response: status: status_code: 201 - category: Success - reason: Created - message: 'Success: (201) Created' + message: Created headers: - server: akka-http/10.1.15 - date: Sun, 17 Mar 2024 21:13:28 GMT - content-type: application/json - content-length: '66' + Date: Tue, 13 Aug 2024 16:35:31 GMT + Content-Type: application/json + Content-Length: '66' body: encoding: '' file: no - string: '{"id":"d09ce70e-bb65-4b3b-ad6d-c92c1e42f599","status":"Submitted"}' - recorded_at: 2024-03-17 21:13:48 GMT - recorded_with: vcr/1.2.2.91, webmockr/0.9.0 + string: '{"id":"f1e0a1c0-304a-4e8b-8244-3074f5ee2fc7","status":"Submitted"}' + recorded_at: 2024-08-13 16:35:47 GMT + recorded_with: vcr/1.6.0, webmockr/1.0.0 - request: method: get - uri: http://localhost:8000/api/workflows/v1/d09ce70e-bb65-4b3b-ad6d-c92c1e42f599/metadata?expandSubWorkflows=false + uri: http://localhost:8000/api/workflows/v1/f1e0a1c0-304a-4e8b-8244-3074f5ee2fc7/metadata?expandSubWorkflows=false body: encoding: '' string: '' - headers: - Accept: application/json, text/xml, application/xml, */* + headers: [] response: status: status_code: 200 - category: Success - reason: OK - message: 'Success: (200) OK' + message: OK headers: - content-encoding: gzip - server: akka-http/10.1.15 - date: Sun, 17 Mar 2024 21:13:48 GMT - transfer-encoding: chunked - content-type: application/json + Content-Encoding: gzip + Date: Tue, 13 Aug 2024 16:35:47 GMT + Transfer-Encoding: chunked + Content-Type: application/json body: encoding: '' file: no - string: '{"workflowName":"test","workflowProcessingEvents":[{"cromwellId":"cromid-01b35cf","description":"PickedUp","timestamp":"2024-03-17T21:13:43.505Z","cromwellVersion":"86"}],"actualWorkflowLanguageVersion":"draft-2","submittedFiles":{"workflow":"task + string: '{"workflowName":"test","workflowProcessingEvents":[{"cromwellId":"cromid-7c918c5","description":"PickedUp","timestamp":"2024-08-13T16:35:41.693Z","cromwellVersion":"87"}],"actualWorkflowLanguageVersion":"draft-2","submittedFiles":{"workflow":"task hello {\n String name\n\n command {\n echo ''Hello ${name}!''\n }\n output - {\n File response = stdout()\n }\n}\n\nworkflow test {\n call hello\n}\n\n","root":"","options":"{\n\n}","inputs":"{\"test.hello.name\":\"World\"}","workflowUrl":"","labels":"{}"},"calls":{"test.hello":[{"executionStatus":"QueuedInCromwell","shardIndex":-1,"backend":"Local","attempt":1,"start":"2024-03-17T21:13:44.550Z"}]},"outputs":{},"workflowRoot":"/Users/schambe3/github/cromwell/cromwell-executions/test/d09ce70e-bb65-4b3b-ad6d-c92c1e42f599","actualWorkflowLanguage":"WDL","status":"Running","start":"2024-03-17T21:13:43.507Z","id":"d09ce70e-bb65-4b3b-ad6d-c92c1e42f599","inputs":{"test.hello.name":"World"},"labels":{"cromwell-workflow-id":"cromwell-d09ce70e-bb65-4b3b-ad6d-c92c1e42f599"},"submission":"2024-03-17T21:13:28.787Z"}' - recorded_at: 2024-03-17 21:13:48 GMT - recorded_with: vcr/1.2.2.91, webmockr/0.9.0 + {\n File response = stdout()\n }\n}\n\nworkflow test {\n call hello\n}\n\n","root":"","options":"{\n\n}","inputs":"{\"test.hello.name\":\"World\"}","workflowUrl":"","labels":"{}"},"calls":{"test.hello":[{"executionStatus":"QueuedInCromwell","shardIndex":-1,"backend":"Local","attempt":1,"start":"2024-08-13T16:35:42.729Z"}]},"outputs":{},"workflowRoot":"/Users/schambe3/github/cromwell/cromwell-executions/test/f1e0a1c0-304a-4e8b-8244-3074f5ee2fc7","actualWorkflowLanguage":"WDL","status":"Running","start":"2024-08-13T16:35:41.694Z","id":"f1e0a1c0-304a-4e8b-8244-3074f5ee2fc7","inputs":{"test.hello.name":"World"},"labels":{"cromwell-workflow-id":"cromwell-f1e0a1c0-304a-4e8b-8244-3074f5ee2fc7"},"submission":"2024-08-13T16:35:31.976Z"}' + recorded_at: 2024-08-13 16:35:47 GMT + recorded_with: vcr/1.6.0, webmockr/1.0.0 diff --git a/tests/fixtures/cromwell_glob_expanded.yml b/tests/fixtures/cromwell_glob_expanded.yml index c74a629..ca915d7 100644 --- a/tests/fixtures/cromwell_glob_expanded.yml +++ b/tests/fixtures/cromwell_glob_expanded.yml @@ -1,29 +1,25 @@ http_interactions: - request: method: get - uri: http://localhost:8000/api/workflows/v1/d09ce70e-bb65-4b3b-ad6d-c92c1e42f599/metadata?expandSubWorkflows=true + uri: http://localhost:8000/api/workflows/v1/f1e0a1c0-304a-4e8b-8244-3074f5ee2fc7/metadata?expandSubWorkflows=true body: encoding: '' string: '' - headers: - Accept: application/json, text/xml, application/xml, */* + headers: [] response: status: status_code: 200 - category: Success - reason: OK - message: 'Success: (200) OK' + message: OK headers: - content-encoding: gzip - server: akka-http/10.1.15 - date: Sun, 17 Mar 2024 21:13:48 GMT - transfer-encoding: chunked - content-type: application/json + Content-Encoding: gzip + Date: Tue, 13 Aug 2024 16:35:47 GMT + Transfer-Encoding: chunked + Content-Type: application/json body: encoding: '' file: no - string: '{"workflowName":"test","workflowProcessingEvents":[{"cromwellId":"cromid-01b35cf","description":"PickedUp","timestamp":"2024-03-17T21:13:43.505Z","cromwellVersion":"86"}],"actualWorkflowLanguageVersion":"draft-2","submittedFiles":{"workflow":"task + string: '{"workflowName":"test","workflowProcessingEvents":[{"cromwellId":"cromid-7c918c5","description":"PickedUp","timestamp":"2024-08-13T16:35:41.693Z","cromwellVersion":"87"}],"actualWorkflowLanguageVersion":"draft-2","submittedFiles":{"workflow":"task hello {\n String name\n\n command {\n echo ''Hello ${name}!''\n }\n output - {\n File response = stdout()\n }\n}\n\nworkflow test {\n call hello\n}\n\n","root":"","options":"{\n\n}","inputs":"{\"test.hello.name\":\"World\"}","workflowUrl":"","labels":"{}"},"calls":{"test.hello":[{"executionStatus":"QueuedInCromwell","shardIndex":-1,"backend":"Local","attempt":1,"start":"2024-03-17T21:13:44.550Z"}]},"outputs":{},"workflowRoot":"/Users/schambe3/github/cromwell/cromwell-executions/test/d09ce70e-bb65-4b3b-ad6d-c92c1e42f599","actualWorkflowLanguage":"WDL","status":"Running","start":"2024-03-17T21:13:43.507Z","id":"d09ce70e-bb65-4b3b-ad6d-c92c1e42f599","inputs":{"test.hello.name":"World"},"labels":{"cromwell-workflow-id":"cromwell-d09ce70e-bb65-4b3b-ad6d-c92c1e42f599"},"submission":"2024-03-17T21:13:28.787Z"}' - recorded_at: 2024-03-17 21:13:48 GMT - recorded_with: vcr/1.2.2.91, webmockr/0.9.0 + {\n File response = stdout()\n }\n}\n\nworkflow test {\n call hello\n}\n\n","root":"","options":"{\n\n}","inputs":"{\"test.hello.name\":\"World\"}","workflowUrl":"","labels":"{}"},"calls":{"test.hello":[{"executionStatus":"QueuedInCromwell","shardIndex":-1,"backend":"Local","attempt":1,"start":"2024-08-13T16:35:42.729Z"}]},"outputs":{},"workflowRoot":"/Users/schambe3/github/cromwell/cromwell-executions/test/f1e0a1c0-304a-4e8b-8244-3074f5ee2fc7","actualWorkflowLanguage":"WDL","status":"Running","start":"2024-08-13T16:35:41.694Z","id":"f1e0a1c0-304a-4e8b-8244-3074f5ee2fc7","inputs":{"test.hello.name":"World"},"labels":{"cromwell-workflow-id":"cromwell-f1e0a1c0-304a-4e8b-8244-3074f5ee2fc7"},"submission":"2024-08-13T16:35:31.976Z"}' + recorded_at: 2024-08-13 16:35:47 GMT + recorded_with: vcr/1.6.0, webmockr/1.0.0 diff --git a/tests/fixtures/cromwell_jobs.yml b/tests/fixtures/cromwell_jobs.yml index d429558..995b708 100644 --- a/tests/fixtures/cromwell_jobs.yml +++ b/tests/fixtures/cromwell_jobs.yml @@ -1,7 +1,7 @@ http_interactions: - request: method: get - uri: http://localhost:8000/api/workflows/v1/query?submission=2024-07-14T00%3A00Z + uri: http://localhost:8000/api/workflows/v1/query?submission=2024-08-12T00%3A00Z body: encoding: '' string: '' @@ -11,13 +11,12 @@ http_interactions: status_code: 200 message: OK headers: - Server: akka-http/10.1.15 - Date: Mon, 15 Jul 2024 22:15:57 GMT + Date: Tue, 13 Aug 2024 16:36:23 GMT Content-Type: application/json - Content-Length: '2035' + Content-Length: '939' body: encoding: '' file: no - string: '{"results":[{"end":"2024-07-15T22:11:12.764Z","id":"b8eb2edf-742a-40b4-9f49-4ea89cd857e1","metadataArchiveStatus":"Unarchived","start":"2024-07-15T22:11:12.751Z","status":"Failed","submission":"2024-07-15T22:11:00.018Z"},{"end":"2024-07-15T22:10:52.734Z","id":"de9cefd6-5134-4130-811c-62bd75333216","metadataArchiveStatus":"Unarchived","start":"2024-07-15T22:10:52.717Z","status":"Failed","submission":"2024-07-15T22:10:51.043Z"},{"end":"2024-07-15T22:07:26.758Z","id":"303243c4-c30f-4269-978b-c7964b066abe","metadataArchiveStatus":"Unarchived","name":"test","start":"2024-07-15T22:07:12.456Z","status":"Succeeded","submission":"2024-07-15T22:07:09.411Z"},{"end":"2024-07-15T22:05:06.577Z","id":"1314984e-c9e6-4dbf-b441-df1581caace2","metadataArchiveStatus":"Unarchived","name":"test","start":"2024-07-15T22:04:52.265Z","status":"Succeeded","submission":"2024-07-15T22:04:51.172Z"},{"end":"2024-07-15T22:01:26.318Z","id":"900e031d-bf5d-4a97-b516-7962ee9b8ad3","metadataArchiveStatus":"Unarchived","name":"test","start":"2024-07-15T22:01:12.008Z","status":"Succeeded","submission":"2024-07-15T22:01:08.141Z"},{"end":"2024-07-15T21:58:07.065Z","id":"94133d20-5afd-4a21-8b3f-717aaec431a1","metadataArchiveStatus":"Unarchived","name":"test","start":"2024-07-15T21:57:51.753Z","status":"Succeeded","submission":"2024-07-15T21:57:36.322Z"},{"end":"2024-07-15T21:57:47.066Z","id":"b88db47d-5bd6-402d-a8f4-dd07eadbfb40","metadataArchiveStatus":"Unarchived","name":"test","start":"2024-07-15T21:57:31.730Z","status":"Succeeded","submission":"2024-07-15T21:57:22.376Z"},{"end":"2024-07-15T21:46:46.082Z","id":"a019666d-cf45-4300-ad26-a41543afbdc7","metadataArchiveStatus":"Unarchived","name":"test","start":"2024-07-15T21:46:30.762Z","status":"Succeeded","submission":"2024-07-15T21:46:29.557Z"},{"end":"2024-07-15T21:44:27.151Z","id":"d0fc92c9-7de0-4102-b574-53ac5a0c4e4a","metadataArchiveStatus":"Unarchived","name":"test","start":"2024-07-15T21:44:10.558Z","status":"Succeeded","submission":"2024-07-15T21:43:54.454Z"}],"totalResultsCount":9}' - recorded_at: 2024-07-15 22:15:57 GMT - recorded_with: vcr/1.2.2.93, webmockr/0.9.1.91 + string: '{"results":[{"end":"2024-08-13T16:35:58.034Z","id":"f1e0a1c0-304a-4e8b-8244-3074f5ee2fc7","metadataArchiveStatus":"Unarchived","name":"test","start":"2024-08-13T16:35:41.694Z","status":"Succeeded","submission":"2024-08-13T16:35:31.976Z"},{"end":"2024-08-13T16:35:36.991Z","id":"428a138c-5700-495c-aa2d-7779f146ad5c","metadataArchiveStatus":"Unarchived","name":"test","start":"2024-08-13T16:35:21.664Z","status":"Succeeded","submission":"2024-08-13T16:35:00.801Z"},{"end":"2024-08-13T16:35:17.992Z","id":"51b35b88-d4dd-49b0-bc16-7d54c1461a07","metadataArchiveStatus":"Unarchived","name":"test","start":"2024-08-13T16:35:01.646Z","status":"Succeeded","submission":"2024-08-13T16:34:45.240Z"},{"end":"2024-08-13T16:33:38.232Z","id":"4482b03f-388f-4bc1-9a5c-ee511a921da4","metadataArchiveStatus":"Unarchived","name":"test","start":"2024-08-13T16:33:21.518Z","status":"Succeeded","submission":"2024-08-13T16:33:20.830Z"}],"totalResultsCount":4}' + recorded_at: 2024-08-13 16:36:23 GMT + recorded_with: vcr/1.6.0, webmockr/1.0.0 diff --git a/tests/fixtures/cromwell_labels_data.yml b/tests/fixtures/cromwell_labels_data.yml index dba5c23..d9bb1c2 100644 --- a/tests/fixtures/cromwell_labels_data.yml +++ b/tests/fixtures/cromwell_labels_data.yml @@ -1,26 +1,22 @@ http_interactions: - request: method: get - uri: http://localhost:8000/api/workflows/v1/287c7902-abc0-49ab-a6ec-0ce0c097b4d2/labels + uri: http://localhost:8000/api/workflows/v1/cae2303d-802d-45f1-a085-d8f658182094/labels body: encoding: '' string: '' - headers: - Accept: application/json, text/xml, application/xml, */* + headers: [] response: status: status_code: 200 - category: Success - reason: OK - message: 'Success: (200) OK' + message: OK headers: - server: akka-http/10.1.15 - date: Fri, 26 Jul 2024 19:26:12 GMT - content-type: application/json - content-length: '200' + Date: Tue, 13 Aug 2024 16:37:31 GMT + Content-Type: application/json + Content-Length: '200' body: encoding: '' file: no - string: '{"id":"287c7902-abc0-49ab-a6ec-0ce0c097b4d2","labels":{"Label":"Apple","secondaryLabel":"Orange","workflowType":"AppSubmission","cromwell-workflow-id":"cromwell-287c7902-abc0-49ab-a6ec-0ce0c097b4d2"}}' - recorded_at: 2024-07-26 19:26:12 GMT + string: '{"id":"cae2303d-802d-45f1-a085-d8f658182094","labels":{"Label":"Apple","secondaryLabel":"Orange","workflowType":"AppSubmission","cromwell-workflow-id":"cromwell-cae2303d-802d-45f1-a085-d8f658182094"}}' + recorded_at: 2024-08-13 16:37:31 GMT recorded_with: vcr/1.6.0, webmockr/1.0.0 diff --git a/tests/fixtures/cromwell_labels_submit.yml b/tests/fixtures/cromwell_labels_submit.yml index a639388..c91b9d6 100644 --- a/tests/fixtures/cromwell_labels_submit.yml +++ b/tests/fixtures/cromwell_labels_submit.yml @@ -4,27 +4,19 @@ http_interactions: uri: http://localhost:8000/api/workflows/v1 body: encoding: '' - string: workflowSource=list(path = "/Users/schambe3/github/getwilds/rcromwell/inst/examples/hello.wdl", - type = "application/octet-stream", name = NULL),workflowInputs=list(path = - "/Users/schambe3/github/getwilds/rcromwell/inst/examples/inputs.json", type - = "application/json", name = NULL),labels=list(path = "/private/var/folders/qt/fzq1m_bj2yb_7b2jz57s9q7c0000gp/T/Rtmp21huqY/rcromwell_1609933b0cbaf.json", - type = "application/json", name = NULL) - headers: - Accept: application/json, text/xml, application/xml, */* + string: '' + headers: [] response: status: status_code: 201 - category: Success - reason: Created - message: 'Success: (201) Created' + message: Created headers: - server: akka-http/10.1.15 - date: Fri, 26 Jul 2024 19:25:52 GMT - content-type: application/json - content-length: '66' + Date: Tue, 13 Aug 2024 16:37:11 GMT + Content-Type: application/json + Content-Length: '66' body: encoding: '' file: no - string: '{"id":"287c7902-abc0-49ab-a6ec-0ce0c097b4d2","status":"Submitted"}' - recorded_at: 2024-07-26 19:25:52 GMT + string: '{"id":"cae2303d-802d-45f1-a085-d8f658182094","status":"Submitted"}' + recorded_at: 2024-08-13 16:37:11 GMT recorded_with: vcr/1.6.0, webmockr/1.0.0 diff --git a/tests/fixtures/cromwell_logs_after.yml b/tests/fixtures/cromwell_logs_after.yml index 24b26b3..bced80a 100644 --- a/tests/fixtures/cromwell_logs_after.yml +++ b/tests/fixtures/cromwell_logs_after.yml @@ -1,7 +1,7 @@ http_interactions: - request: method: get - uri: http://localhost:8000/api/workflows/v1/94133d20-5afd-4a21-8b3f-717aaec431a1/logs + uri: http://localhost:8000/api/workflows/v1/930ff27a-af5e-4168-a939-757e202b5105/logs body: encoding: '' string: '' @@ -11,13 +11,12 @@ http_interactions: status_code: 200 message: OK headers: - Server: akka-http/10.1.15 - Date: Mon, 15 Jul 2024 21:58:13 GMT + Date: Tue, 13 Aug 2024 16:39:02 GMT Content-Type: application/json Content-Length: '366' body: encoding: '' file: no - string: '{"calls":{"test.hello":[{"stderr":"/Users/schambe3/github/cromwell/cromwell-executions/test/94133d20-5afd-4a21-8b3f-717aaec431a1/call-hello/execution/stderr","stdout":"/Users/schambe3/github/cromwell/cromwell-executions/test/94133d20-5afd-4a21-8b3f-717aaec431a1/call-hello/execution/stdout","attempt":1,"shardIndex":-1}]},"id":"94133d20-5afd-4a21-8b3f-717aaec431a1"}' - recorded_at: 2024-07-15 21:58:13 GMT - recorded_with: vcr/1.2.2.93, webmockr/0.9.1.91 + string: '{"calls":{"test.hello":[{"stderr":"/Users/schambe3/github/cromwell/cromwell-executions/test/930ff27a-af5e-4168-a939-757e202b5105/call-hello/execution/stderr","stdout":"/Users/schambe3/github/cromwell/cromwell-executions/test/930ff27a-af5e-4168-a939-757e202b5105/call-hello/execution/stdout","attempt":1,"shardIndex":-1}]},"id":"930ff27a-af5e-4168-a939-757e202b5105"}' + recorded_at: 2024-08-13 16:39:02 GMT + recorded_with: vcr/1.6.0, webmockr/1.0.0 diff --git a/tests/fixtures/cromwell_logs_before.yml b/tests/fixtures/cromwell_logs_before.yml index a9b0c32..756df23 100644 --- a/tests/fixtures/cromwell_logs_before.yml +++ b/tests/fixtures/cromwell_logs_before.yml @@ -11,19 +11,18 @@ http_interactions: status_code: 201 message: Created headers: - Server: akka-http/10.1.15 - Date: Mon, 15 Jul 2024 21:57:36 GMT + Date: Tue, 13 Aug 2024 16:38:07 GMT Content-Type: application/json Content-Length: '66' body: encoding: '' file: no - string: '{"id":"94133d20-5afd-4a21-8b3f-717aaec431a1","status":"Submitted"}' - recorded_at: 2024-07-15 21:57:46 GMT - recorded_with: vcr/1.2.2.93, webmockr/0.9.1.91 + string: '{"id":"930ff27a-af5e-4168-a939-757e202b5105","status":"Submitted"}' + recorded_at: 2024-08-13 16:38:17 GMT + recorded_with: vcr/1.6.0, webmockr/1.0.0 - request: method: get - uri: http://localhost:8000/api/workflows/v1/94133d20-5afd-4a21-8b3f-717aaec431a1/logs + uri: http://localhost:8000/api/workflows/v1/930ff27a-af5e-4168-a939-757e202b5105/logs body: encoding: '' string: '' @@ -33,13 +32,12 @@ http_interactions: status_code: 200 message: OK headers: - Server: akka-http/10.1.15 - Date: Mon, 15 Jul 2024 21:57:46 GMT + Date: Tue, 13 Aug 2024 16:38:17 GMT Content-Type: application/json Content-Length: '45' body: encoding: '' file: no - string: '{"id":"94133d20-5afd-4a21-8b3f-717aaec431a1"}' - recorded_at: 2024-07-15 21:57:46 GMT - recorded_with: vcr/1.2.2.93, webmockr/0.9.1.91 + string: '{"id":"930ff27a-af5e-4168-a939-757e202b5105"}' + recorded_at: 2024-08-13 16:38:17 GMT + recorded_with: vcr/1.6.0, webmockr/1.0.0 diff --git a/tests/fixtures/cromwell_outputs.yml b/tests/fixtures/cromwell_outputs.yml index c18168c..b73e329 100644 --- a/tests/fixtures/cromwell_outputs.yml +++ b/tests/fixtures/cromwell_outputs.yml @@ -1,7 +1,7 @@ http_interactions: - request: method: get - uri: http://localhost:8000/api/workflows/v1/56d9c453-9221-437c-9f33-a27ad243c840/outputs + uri: http://localhost:8000/api/workflows/v1/032c9dc7-1f87-4eb9-a005-e28be7f5d1ad/outputs body: encoding: '' string: '' @@ -11,13 +11,12 @@ http_interactions: status_code: 200 message: OK headers: - Server: akka-http/10.1.15 - Date: Mon, 15 Jul 2024 19:33:19 GMT + Date: Tue, 13 Aug 2024 16:41:10 GMT Content-Type: application/json Content-Length: '203' body: encoding: '' file: no - string: '{"outputs":{"test.hello.response":"/Users/schambe3/github/cromwell/cromwell-executions/test/56d9c453-9221-437c-9f33-a27ad243c840/call-hello/execution/stdout"},"id":"56d9c453-9221-437c-9f33-a27ad243c840"}' - recorded_at: 2024-07-15 19:33:19 GMT - recorded_with: vcr/1.2.2.93, webmockr/0.9.1.91 + string: '{"outputs":{"test.hello.response":"/Users/schambe3/github/cromwell/cromwell-executions/test/032c9dc7-1f87-4eb9-a005-e28be7f5d1ad/call-hello/execution/stdout"},"id":"032c9dc7-1f87-4eb9-a005-e28be7f5d1ad"}' + recorded_at: 2024-08-13 16:41:10 GMT + recorded_with: vcr/1.6.0, webmockr/1.0.0 diff --git a/tests/fixtures/cromwell_outputs_prep.yml b/tests/fixtures/cromwell_outputs_prep.yml index 7f11543..dc65413 100644 --- a/tests/fixtures/cromwell_outputs_prep.yml +++ b/tests/fixtures/cromwell_outputs_prep.yml @@ -11,13 +11,12 @@ http_interactions: status_code: 201 message: Created headers: - Server: akka-http/10.1.15 - Date: Mon, 15 Jul 2024 19:32:34 GMT + Date: Tue, 13 Aug 2024 16:40:25 GMT Content-Type: application/json Content-Length: '66' body: encoding: '' file: no - string: '{"id":"56d9c453-9221-437c-9f33-a27ad243c840","status":"Submitted"}' - recorded_at: 2024-07-15 19:32:34 GMT - recorded_with: vcr/1.2.2.93, webmockr/0.9.1.91 + string: '{"id":"032c9dc7-1f87-4eb9-a005-e28be7f5d1ad","status":"Submitted"}' + recorded_at: 2024-08-13 16:40:25 GMT + recorded_with: vcr/1.6.0, webmockr/1.0.0 diff --git a/tests/fixtures/cromwell_submit_batch.yml b/tests/fixtures/cromwell_submit_batch.yml index 461398c..a417aa3 100644 --- a/tests/fixtures/cromwell_submit_batch.yml +++ b/tests/fixtures/cromwell_submit_batch.yml @@ -4,26 +4,19 @@ http_interactions: uri: http://localhost:8000/api/workflows/v1 body: encoding: '' - string: workflowSource=list(path = "/Users/schambe3/github/getwilds/rcromwell/inst/examples/hello.wdl", - type = "application/octet-stream", name = NULL),workflowInputs=list(path = - "/Users/schambe3/github/getwilds/rcromwell/inst/examples/inputs.json", type - = "application/json", name = NULL) - headers: - Accept: application/json, text/xml, application/xml, */* + string: '' + headers: [] response: status: status_code: 201 - category: Success - reason: Created - message: 'Success: (201) Created' + message: Created headers: - server: akka-http/10.1.15 - date: Fri, 05 Jan 2024 16:43:12 GMT - content-type: application/json - content-length: '66' + Date: Tue, 13 Aug 2024 16:41:48 GMT + Content-Type: application/json + Content-Length: '66' body: encoding: '' file: no - string: '{"id":"686f4bf8-a89d-4920-b7bd-129030b44d18","status":"Submitted"}' - recorded_at: 2024-01-05 16:43:12 GMT - recorded_with: vcr/1.2.2.91, webmockr/0.9.0 + string: '{"id":"ec60a3d3-9541-4784-84b8-28ffa226621e","status":"Submitted"}' + recorded_at: 2024-08-13 16:41:48 GMT + recorded_with: vcr/1.6.0, webmockr/1.0.0 diff --git a/tests/fixtures/cromwell_submit_batch_http.yml b/tests/fixtures/cromwell_submit_batch_http.yml index 04054e5..4e60e19 100644 --- a/tests/fixtures/cromwell_submit_batch_http.yml +++ b/tests/fixtures/cromwell_submit_batch_http.yml @@ -4,26 +4,19 @@ http_interactions: uri: http://localhost:8000/api/workflows/v1 body: encoding: '' - string: workflowSource=list(path = "/Users/schambe3/github/getwilds/rcromwell/inst/examples/hello.wdl", - type = "application/octet-stream", name = NULL),workflowInputs=list(path = - "/Users/schambe3/github/getwilds/rcromwell/inst/examples/inputs.json", type - = "application/json", name = NULL) - headers: - Accept: application/json, text/xml, application/xml, */* + string: '' + headers: [] response: status: status_code: 201 - category: Success - reason: Created - message: 'Success: (201) Created' + message: Created headers: - server: akka-http/10.1.15 - date: Sun, 17 Mar 2024 04:34:30 GMT - content-type: application/json - content-length: '66' + Date: Tue, 13 Aug 2024 16:41:48 GMT + Content-Type: application/json + Content-Length: '66' body: encoding: '' file: no - string: '{"id":"d1396931-ef09-4960-bcdf-d09a4115fd44","status":"Submitted"}' - recorded_at: 2024-03-17 04:34:30 GMT - recorded_with: vcr/1.2.2.91, webmockr/0.9.0 + string: '{"id":"e6fd5ad4-0a50-4208-8020-54324ff77c59","status":"Submitted"}' + recorded_at: 2024-08-13 16:41:48 GMT + recorded_with: vcr/1.6.0, webmockr/1.0.0 diff --git a/tests/fixtures/cromwell_submit_batch_workflow_options.yml b/tests/fixtures/cromwell_submit_batch_workflow_options.yml index 5b05182..6bc0193 100644 --- a/tests/fixtures/cromwell_submit_batch_workflow_options.yml +++ b/tests/fixtures/cromwell_submit_batch_workflow_options.yml @@ -11,13 +11,12 @@ http_interactions: status_code: 201 message: Created headers: - Server: akka-http/10.1.15 - Date: Mon, 15 Jul 2024 20:04:53 GMT + Date: Tue, 13 Aug 2024 16:41:48 GMT Content-Type: application/json Content-Length: '66' body: encoding: '' file: no - string: '{"id":"b273be2c-cfd7-42a0-9d6d-d3d4a4f9c1b6","status":"Submitted"}' - recorded_at: 2024-07-15 20:04:53 GMT - recorded_with: vcr/1.2.2.93, webmockr/0.9.1.91 + string: '{"id":"34604b3e-a4d7-43b4-a359-8f7dcd4c689b","status":"Submitted"}' + recorded_at: 2024-08-13 16:41:48 GMT + recorded_with: vcr/1.6.0, webmockr/1.0.0 diff --git a/tests/fixtures/cromwell_validate.yml b/tests/fixtures/cromwell_validate.yml index 7ec3358..fd339a8 100644 --- a/tests/fixtures/cromwell_validate.yml +++ b/tests/fixtures/cromwell_validate.yml @@ -11,13 +11,12 @@ http_interactions: status_code: 200 message: OK headers: - Server: akka-http/10.1.15 - Date: Mon, 15 Jul 2024 20:21:49 GMT + Date: Tue, 13 Aug 2024 16:42:14 GMT Content-Type: application/json Content-Length: '463' body: encoding: '' file: no string: '{"valid":true,"errors":[],"validWorkflow":true,"name":"test","inputs":[{"name":"hello.name","valueType":{"typeName":"String"},"typeDisplayName":"String","optional":false,"default":null}],"outputs":[{"name":"hello.response","valueType":{"typeName":"File"},"typeDisplayName":"File"}],"images":[],"submittedDescriptorType":{"descriptorType":"WDL","descriptorTypeVersion":"draft-2"},"importedDescriptorTypes":[],"meta":{},"parameterMeta":{},"isRunnableWorkflow":true}' - recorded_at: 2024-07-15 20:21:49 GMT - recorded_with: vcr/1.2.2.93, webmockr/0.9.1.91 + recorded_at: 2024-08-13 16:42:14 GMT + recorded_with: vcr/1.6.0, webmockr/1.0.0 diff --git a/tests/fixtures/cromwell_workflow.yml b/tests/fixtures/cromwell_workflow.yml index 7721844..7485106 100644 --- a/tests/fixtures/cromwell_workflow.yml +++ b/tests/fixtures/cromwell_workflow.yml @@ -1,7 +1,7 @@ http_interactions: - request: method: get - uri: http://localhost:8000/api/workflows/v1/363c4a00-e3c5-4984-b4ad-ac06466dfaad/metadata?expandSubWorkflows=false&excludeKey=calls + uri: http://localhost:8000/api/workflows/v1/1adcd013-64e7-416a-8553-67302f4821f5/metadata?expandSubWorkflows=false&excludeKey=calls body: encoding: '' string: '' @@ -12,15 +12,14 @@ http_interactions: message: OK headers: Content-Encoding: gzip - Server: akka-http/10.1.15 - Date: Mon, 15 Jul 2024 22:18:07 GMT + Date: Tue, 13 Aug 2024 16:43:07 GMT Transfer-Encoding: chunked Content-Type: application/json body: encoding: '' file: no - string: '{"workflowName":"test","workflowProcessingEvents":[{"cromwellId":"cromid-d1d4e5c","description":"PickedUp","timestamp":"2024-07-15T22:17:53.169Z","cromwellVersion":"86"}],"actualWorkflowLanguageVersion":"draft-2","submittedFiles":{"workflow":"task + string: '{"workflowName":"test","workflowProcessingEvents":[{"cromwellId":"cromid-7c918c5","description":"PickedUp","timestamp":"2024-08-13T16:43:02.303Z","cromwellVersion":"87"}],"actualWorkflowLanguageVersion":"draft-2","submittedFiles":{"workflow":"task hello {\n String name\n\n command {\n echo ''Hello ${name}!''\n }\n output - {\n File response = stdout()\n }\n}\n\nworkflow test {\n call hello\n}\n\n","root":"","options":"{\n\n}","inputs":"{\"test.hello.name\":\"World\"}","workflowUrl":"","labels":"{}"},"calls":{},"outputs":{},"workflowRoot":"/Users/schambe3/github/cromwell/cromwell-executions/test/363c4a00-e3c5-4984-b4ad-ac06466dfaad","actualWorkflowLanguage":"WDL","status":"Running","start":"2024-07-15T22:17:53.171Z","id":"363c4a00-e3c5-4984-b4ad-ac06466dfaad","inputs":{"test.hello.name":"World"},"labels":{"cromwell-workflow-id":"cromwell-363c4a00-e3c5-4984-b4ad-ac06466dfaad"},"submission":"2024-07-15T22:17:37.512Z"}' - recorded_at: 2024-07-15 22:18:07 GMT - recorded_with: vcr/1.2.2.93, webmockr/0.9.1.91 + {\n File response = stdout()\n }\n}\n\nworkflow test {\n call hello\n}\n\n","root":"","options":"{\n\n}","inputs":"{\"test.hello.name\":\"World\"}","workflowUrl":"","labels":"{}"},"calls":{},"outputs":{},"workflowRoot":"/Users/schambe3/github/cromwell/cromwell-executions/test/1adcd013-64e7-416a-8553-67302f4821f5","actualWorkflowLanguage":"WDL","status":"Running","start":"2024-08-13T16:43:02.304Z","id":"1adcd013-64e7-416a-8553-67302f4821f5","inputs":{"test.hello.name":"World"},"labels":{"cromwell-workflow-id":"cromwell-1adcd013-64e7-416a-8553-67302f4821f5"},"submission":"2024-08-13T16:42:37.206Z"}' + recorded_at: 2024-08-13 16:43:07 GMT + recorded_with: vcr/1.6.0, webmockr/1.0.0 diff --git a/tests/fixtures/cromwell_workflow_http.yml b/tests/fixtures/cromwell_workflow_http.yml index 7721844..7485106 100644 --- a/tests/fixtures/cromwell_workflow_http.yml +++ b/tests/fixtures/cromwell_workflow_http.yml @@ -1,7 +1,7 @@ http_interactions: - request: method: get - uri: http://localhost:8000/api/workflows/v1/363c4a00-e3c5-4984-b4ad-ac06466dfaad/metadata?expandSubWorkflows=false&excludeKey=calls + uri: http://localhost:8000/api/workflows/v1/1adcd013-64e7-416a-8553-67302f4821f5/metadata?expandSubWorkflows=false&excludeKey=calls body: encoding: '' string: '' @@ -12,15 +12,14 @@ http_interactions: message: OK headers: Content-Encoding: gzip - Server: akka-http/10.1.15 - Date: Mon, 15 Jul 2024 22:18:07 GMT + Date: Tue, 13 Aug 2024 16:43:07 GMT Transfer-Encoding: chunked Content-Type: application/json body: encoding: '' file: no - string: '{"workflowName":"test","workflowProcessingEvents":[{"cromwellId":"cromid-d1d4e5c","description":"PickedUp","timestamp":"2024-07-15T22:17:53.169Z","cromwellVersion":"86"}],"actualWorkflowLanguageVersion":"draft-2","submittedFiles":{"workflow":"task + string: '{"workflowName":"test","workflowProcessingEvents":[{"cromwellId":"cromid-7c918c5","description":"PickedUp","timestamp":"2024-08-13T16:43:02.303Z","cromwellVersion":"87"}],"actualWorkflowLanguageVersion":"draft-2","submittedFiles":{"workflow":"task hello {\n String name\n\n command {\n echo ''Hello ${name}!''\n }\n output - {\n File response = stdout()\n }\n}\n\nworkflow test {\n call hello\n}\n\n","root":"","options":"{\n\n}","inputs":"{\"test.hello.name\":\"World\"}","workflowUrl":"","labels":"{}"},"calls":{},"outputs":{},"workflowRoot":"/Users/schambe3/github/cromwell/cromwell-executions/test/363c4a00-e3c5-4984-b4ad-ac06466dfaad","actualWorkflowLanguage":"WDL","status":"Running","start":"2024-07-15T22:17:53.171Z","id":"363c4a00-e3c5-4984-b4ad-ac06466dfaad","inputs":{"test.hello.name":"World"},"labels":{"cromwell-workflow-id":"cromwell-363c4a00-e3c5-4984-b4ad-ac06466dfaad"},"submission":"2024-07-15T22:17:37.512Z"}' - recorded_at: 2024-07-15 22:18:07 GMT - recorded_with: vcr/1.2.2.93, webmockr/0.9.1.91 + {\n File response = stdout()\n }\n}\n\nworkflow test {\n call hello\n}\n\n","root":"","options":"{\n\n}","inputs":"{\"test.hello.name\":\"World\"}","workflowUrl":"","labels":"{}"},"calls":{},"outputs":{},"workflowRoot":"/Users/schambe3/github/cromwell/cromwell-executions/test/1adcd013-64e7-416a-8553-67302f4821f5","actualWorkflowLanguage":"WDL","status":"Running","start":"2024-08-13T16:43:02.304Z","id":"1adcd013-64e7-416a-8553-67302f4821f5","inputs":{"test.hello.name":"World"},"labels":{"cromwell-workflow-id":"cromwell-1adcd013-64e7-416a-8553-67302f4821f5"},"submission":"2024-08-13T16:42:37.206Z"}' + recorded_at: 2024-08-13 16:43:07 GMT + recorded_with: vcr/1.6.0, webmockr/1.0.0 diff --git a/tests/fixtures/cromwell_workflow_prep.yml b/tests/fixtures/cromwell_workflow_prep.yml index dfb2e87..b0d1984 100644 --- a/tests/fixtures/cromwell_workflow_prep.yml +++ b/tests/fixtures/cromwell_workflow_prep.yml @@ -11,13 +11,12 @@ http_interactions: status_code: 201 message: Created headers: - Server: akka-http/10.1.15 - Date: Mon, 15 Jul 2024 22:17:37 GMT + Date: Tue, 13 Aug 2024 16:42:37 GMT Content-Type: application/json Content-Length: '66' body: encoding: '' file: no - string: '{"id":"363c4a00-e3c5-4984-b4ad-ac06466dfaad","status":"Submitted"}' - recorded_at: 2024-07-15 22:17:37 GMT - recorded_with: vcr/1.2.2.93, webmockr/0.9.1.91 + string: '{"id":"1adcd013-64e7-416a-8553-67302f4821f5","status":"Submitted"}' + recorded_at: 2024-08-13 16:42:37 GMT + recorded_with: vcr/1.6.0, webmockr/1.0.0 diff --git a/tests/testthat/test-cromwell_glob.R b/tests/testthat/test-cromwell_glob.R index d10f83a..a70ffb1 100644 --- a/tests/testthat/test-cromwell_glob.R +++ b/tests/testthat/test-cromwell_glob.R @@ -1,7 +1,7 @@ test_that("cromwell_glob", { vcr::use_cassette("cromwell_glob", { res <- cromwell_submit_batch(wdl = file_hello, params = file_inputs) - # Sys.sleep(20) # Needed only for recording new fixture #nolint + # Sys.sleep(15) # Needed only for recording new fixture #nolint res <- cromwell_glob(res$id) })