Skip to content
Snippets Groups Projects
Commit 720d6d05 authored by Janet Goldstein's avatar Janet Goldstein
Browse files

gripe-fix-remaining-tests: broken solicitor tests fixed

parent 2a698055
No related branches found
No related tags found
1 merge request!829Gripe: fix broken solicitor tests
Pipeline #4531 passed
...@@ -45,7 +45,7 @@ expected_metadata = { ...@@ -45,7 +45,7 @@ expected_metadata = {
"title": "JVLA monitoring of an in-progress extreme scattering event", "title": "JVLA monitoring of an in-progress extreme scattering event",
"telescope": "EVLA", "telescope": "EVLA",
"startTime": "57685.661952546296", "startTime": "57685.661952546296",
"observer": "Keith Bannister", "observer": "Mickey Mouse",
}, },
"destinationDirectory": "/lustre/aoc/cluster/pipeline/docker/workspaces/spool/tmp576dknjp", "destinationDirectory": "/lustre/aoc/cluster/pipeline/docker/workspaces/spool/tmp576dknjp",
} }
...@@ -77,7 +77,7 @@ class TestSolicitor: ...@@ -77,7 +77,7 @@ class TestSolicitor:
"workflowRequestId": "2", "workflowRequestId": "2",
"spl": "uid://evla/execblock/48ba4c9d-d7c7-4a8f-9803-1115cd52459b", "spl": "uid://evla/execblock/48ba4c9d-d7c7-4a8f-9803-1115cd52459b",
"processingStart": "2021_07_06T21_50_48", "processingStart": "2021_07_06T21_50_48",
"destinationDir": "/lustre/aoc/cluster/pipeline/docker/workspaces/spool/tmp576dknjp", "destinationDir": "/somewhere/over/the/rainbow/tmp576dknjp",
"workflowDir": "tmp576dknjp", "workflowDir": "tmp576dknjp",
"initialVersionDir": "tmp24i4o1yl", "initialVersionDir": "tmp24i4o1yl",
"multiVersion": True, "multiVersion": True,
...@@ -89,7 +89,7 @@ class TestSolicitor: ...@@ -89,7 +89,7 @@ class TestSolicitor:
assert parameters["initialVersionDir"] == expected_parameters["initialVersionDir"] assert parameters["initialVersionDir"] == expected_parameters["initialVersionDir"]
def test_solicit_parameters_image(self, solicitor: Solicitor): def test_solicit_parameters_image(self, solicitor: Solicitor):
initial_version_dir = "tmprb1se376" initial_version_dir = "initial_version_dir"
cal_source_dir = "tmp576dknjp" cal_source_dir = "tmp576dknjp"
metadata = { metadata = {
"fileSetIds": "brain_000.58099.67095825232", "fileSetIds": "brain_000.58099.67095825232",
...@@ -97,18 +97,16 @@ class TestSolicitor: ...@@ -97,18 +97,16 @@ class TestSolicitor:
"systemId": "12", "systemId": "12",
"creationTime": "2021-07-29T14:26:31", "creationTime": "2021-07-29T14:26:31",
"productLocator": "uid://evla/execblock/ec082e65-452d-4fec-ad88-f5b4af1f9e36", "productLocator": "uid://evla/execblock/ec082e65-452d-4fec-ad88-f5b4af1f9e36",
"calProductLocator": "uid://evla/calibration/c78ccfd6-fe4e-43c6-a5c5-70e5bcfde16b", "calProductLocator": "uid://eenie/meanie/miney/moe",
"projectMetadata": { "projectMetadata": {
"projectCode": "Operations", "projectCode": "Operations",
"title": "", "title": "",
"telescope": "EVLA", "telescope": "EVLA",
"startTime": "58099.6710792824", "startTime": "58099.6710792824",
"observer": "VLA Operations", "observer": "Just Us Chickens",
}, },
"destinationDirectory": "/lustre/aoc/cluster/pipeline/docker/workspaces/spool/" + initial_version_dir, "destinationDirectory": "/lustre/aoc/cluster/pipeline/docker/workspaces/spool/" + initial_version_dir,
"calibrationSourceDirectory": "/lustre/aoc/cluster/pipeline/docker/workspaces/spool/" "calibrationSourceDirectory": f"/my/stuff/{cal_source_dir}/working",
+ cal_source_dir
+ "/working",
"cmsName": "brain_000.58099.67095825232.ms", "cmsName": "brain_000.58099.67095825232.ms",
} }
with patch(SOLICIT_WORKFLOWS_PATCH, return_value=metadata): with patch(SOLICIT_WORKFLOWS_PATCH, return_value=metadata):
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment