Merge pull request #11 from larsks/fix/patch-rsync-script

Avoid comparing embedded script in unit tests

Author: memalhot

build_yaml.py

@@ -1,6 +1,29 @@
 # pyright: reportExplicitAny=false
 from typing import Any
 
+rsync_script = """
+set -e
+export RSYNC_RSH='oc rsh -c {devcontainer}'
+
+mkdir -p {job_name}
+
+rsync -q --archive --no-owner --no-group --omit-dir-times \
+    --numeric-ids {devpod_name}:{getlist_path} {job_name}/getlist
+rsync -q -r --archive --no-owner --no-group \
+    --omit-dir-times --numeric-ids --files-from={job_name}/getlist \
+    {devpod_name}:{context_dir}/ {job_name}/
+find {job_name} -mindepth 1 -maxdepth 1 > {job_name}/gotlist
+
+(
+  cd {job_name} && {cmdline} |& tee {job_name}.log
+)
+
+rsync -q --archive --no-owner --no-group \
+    --omit-dir-times --no-relative --numeric-ids  \
+    --exclude-from={job_name}/gotlist \
+    {job_name} {devpod_name}:{jobs_dir}
+"""
+
 
 def build_job_body(
     job_name: str,
@@ -39,30 +62,7 @@ def build_job_body(
         command = [
             "/bin/bash",
             "-c",
-            (
-                f"""
-set -e
-export RSYNC_RSH='oc rsh -c {devcontainer}'
-
-mkdir -p {job_name}
-
-rsync -q --archive --no-owner --no-group --omit-dir-times \
-    --numeric-ids {devpod_name}:{getlist_path} {job_name}/getlist
-rsync -q -r --archive --no-owner --no-group \
-    --omit-dir-times --numeric-ids --files-from={job_name}/getlist \
-    {devpod_name}:{context_dir}/ {job_name}/
-find {job_name} -mindepth 1 -maxdepth 1 > {job_name}/gotlist
-
-(
-  cd {job_name} && {cmdline} |& tee {job_name}.log
-)
-
-rsync -q --archive --no-owner --no-group \
-    --omit-dir-times --no-relative --numeric-ids  \
-    --exclude-from={job_name}/gotlist \
-    {job_name} {devpod_name}:{jobs_dir}
-"""
-            ),
+            rsync_script.format_map(locals()),
         ]
     else:
         command = ["/bin/bash", "-c", cmdline]

tests/test_br.py

@@ -4,6 +4,7 @@
 import tempfile
 import argparse
 
+import build_yaml
 from br import CreateJobCommand
 from tests.helpers import DictToObject
 
@@ -78,12 +79,12 @@ def test_create_job_nowait(
                     "containers": [
                         {
                             "name": "job-v100-123-container",
-                            "image": "image-registry.openshift-image-registry.svc:5000/redhat-ods-applications/csw-run-f25:latest",
                             "command": [
                                 "/bin/bash",
                                 "-c",
-                                f"\nset -e\nexport RSYNC_RSH='oc rsh -c container1'\n\nmkdir -p job-v100-123\n\nrsync -q --archive --no-owner --no-group --omit-dir-times     --numeric-ids testhost:{tempdir}/jobs/job-v100-123/getlist job-v100-123/getlist\nrsync -q -r --archive --no-owner --no-group     --omit-dir-times --numeric-ids --files-from=job-v100-123/getlist     testhost:{tempdir}/ job-v100-123/\nfind job-v100-123 -mindepth 1 -maxdepth 1 > job-v100-123/gotlist\n\n(\n  cd job-v100-123 &&  |& tee job-v100-123.log\n)\n\nrsync -q --archive --no-owner --no-group     --omit-dir-times --no-relative --numeric-ids      --exclude-from=job-v100-123/gotlist     job-v100-123 testhost:{tempdir}/jobs\n",
-                        ],
+                                f"testcommand {' '.join(args.command).strip()}",
+                            ],
+                            "image": "image-registry.openshift-image-registry.svc:5000/redhat-ods-applications/csw-run-f25:latest",
                             "resources": {
                                 "requests": {"nvidia.com/gpu": "1"},
                                 "limits": {"nvidia.com/gpu": "1"},
@@ -95,6 +96,7 @@ def test_create_job_nowait(
         },
     }
 
+    build_yaml.rsync_script = "testcommand {cmdline}"
     CreateJobCommand.run(args)
 
     assert mock_create.call_args.args[0] == expected