From e29b69657133c009bfe58ba52ccc96f5325e5a65 Mon Sep 17 00:00:00 2001
From: chausman <chausman@nrao.edu>
Date: Wed, 15 Sep 2021 14:18:09 -0600
Subject: [PATCH] update tests
---
shared/workspaces/test/test_remote_processing_service.py | 7 ++++---
shared/workspaces/test/test_views.py | 2 ++
2 files changed, 6 insertions(+), 3 deletions(-)
diff --git a/shared/workspaces/test/test_remote_processing_service.py b/shared/workspaces/test/test_remote_processing_service.py
index 027ad0c22..69ef9325f 100644
--- a/shared/workspaces/test/test_remote_processing_service.py
+++ b/shared/workspaces/test/test_remote_processing_service.py
@@ -1,4 +1,3 @@
-import os
from datetime import datetime
from unittest.mock import patch
@@ -14,12 +13,14 @@ tests for remote_processing_service.CapoInjector
expected_view = [
"edu.nrao.workspaces.WorkflowSettings.serviceUrl",
"edu.nrao.workspaces.NotificationSettings.serviceUrl",
+ "edu.nrao.workspaces.UISettings.serviceUrl",
"edu.nrao.workspaces.ProcessingSettings.useCasa",
"edu.nrao.archive.workflow.config.CasaVersions.homeForReprocessing",
]
expected_subspace = [
"edu.nrao.workspaces.WorkflowSettings.serviceUrl = http://workflow:3456",
"edu.nrao.workspaces.NotificationSettings.serviceUrl = http://notification:3458",
+ "edu.nrao.workspaces.UISettings.serviceUrl = http://localhost:4444/workspaces",
"edu.nrao.workspaces.ProcessingSettings.useCasa = false",
"edu.nrao.archive.workflow.config.CasaVersions.homeForReprocessing = /home/casa/packages/pipeline/current",
]
@@ -27,7 +28,7 @@ expected_subspace = [
request = WorkflowRequest(
workflow_request_id=-3,
workflow_name="vlass_seci",
- argument={},
+ argument={"remote": True},
state="Created",
results_dir="/i/am/a/path",
created_at=datetime(2021, 1, 1),
@@ -56,7 +57,7 @@ class TestCapoInjector:
assert abs_file.filename == "docker.properties"
assert (
abs_file.content
- == """edu.nrao.workspaces.WorkflowSettings.serviceUrl = http://workflow:3456\nedu.nrao.workspaces.NotificationSettings.serviceUrl = http://notification:3458\nedu.nrao.workspaces.ProcessingSettings.useCasa = false\nedu.nrao.archive.workflow.config.CasaVersions.homeForReprocessing = /home/casa/packages/pipeline/current""".encode()
+ == """edu.nrao.workspaces.WorkflowSettings.serviceUrl = http://workflow:3456\nedu.nrao.workspaces.NotificationSettings.serviceUrl = http://notification:3458\nedu.nrao.workspaces.UISettings.serviceUrl = http://localhost:4444/workspaces\nedu.nrao.workspaces.ProcessingSettings.useCasa = false\nedu.nrao.archive.workflow.config.CasaVersions.homeForReprocessing = /home/casa/packages/pipeline/current""".encode()
)
@patch("pathlib.Path.write_bytes")
diff --git a/shared/workspaces/test/test_views.py b/shared/workspaces/test/test_views.py
index c82a1ffb6..df8cd9ef7 100644
--- a/shared/workspaces/test/test_views.py
+++ b/shared/workspaces/test/test_views.py
@@ -14,6 +14,7 @@ expected_list = DictView(
"general": [
"edu.nrao.workspaces.WorkflowSettings.serviceUrl",
"edu.nrao.workspaces.NotificationSettings.serviceUrl",
+ "edu.nrao.workspaces.UISettings.serviceUrl",
],
"casa_requirements": [
"edu.nrao.workspaces.ProcessingSettings.useCasa",
@@ -47,6 +48,7 @@ class TestViewWorkflowCapoParameters:
assert constructed_view == [
"edu.nrao.workspaces.WorkflowSettings.serviceUrl",
"edu.nrao.workspaces.NotificationSettings.serviceUrl",
+ "edu.nrao.workspaces.UISettings.serviceUrl",
"edu.nrao.workspaces.ProcessingSettings.useCasa",
"edu.nrao.archive.workflow.config.CasaVersions.homeForReprocessing",
]
--
GitLab