2411: Fix tests to accommodate copyright notices.

Arvados-DCO-1.1-Signed-off-by: Tom Clegg <tom@curoverse.com>

diff --git a/lib/crunchstat/crunchstat_test.go b/lib/crunchstat/crunchstat_test.go
index 697f2352d503fef199ee4eeda2c28550a526d439..02954b8bf759c20a1bd8b6cf177659db188e3212 100644 (file)
--- a/lib/crunchstat/crunchstat_test.go
+++ b/lib/crunchstat/crunchstat_test.go
@@ -56,7 +56,7 @@ func TestReadAllOrWarnSuccess(t *testing.T) {
        if err != nil {
                t.Fatalf("got error %s", err)
        }
-       if matched, err := regexp.MatchString("^package crunchstat\n", string(data)); err != nil || !matched {
+       if matched, err := regexp.MatchString("\npackage crunchstat\n", string(data)); err != nil || !matched {
                t.Fatalf("data failed regexp: err %v, matched %v", err, matched)
        }
 }

diff --git a/sdk/cwl/tests/matcher.py b/sdk/cwl/tests/matcher.py
index d3c93168e188cd345fde2117a741c803e0b00b13..892586247cc8441fe90350459aef411ba6fca80f 100644 (file)
--- a/sdk/cwl/tests/matcher.py
+++ b/sdk/cwl/tests/matcher.py
@@ -1,5 +1,6 @@
 import difflib
 import json
+import re
 
 
 class JsonDiffMatcher(object):
@@ -21,3 +22,7 @@ class JsonDiffMatcher(object):
                 actual_json.splitlines(1),
                 fromfile="Expected", tofile="Actual")))
         return True
+
+
+def StripYAMLComments(yml):
+    return re.sub(r'(?ms)^(#.*?\n)*\n*', '', yml)

diff --git a/sdk/cwl/tests/test_job.py b/sdk/cwl/tests/test_job.py
index a71d1d8e074e771757dd0ca12869a4190f5667bd..0d26d04522518a2d25123267f0086eb14bfe1089 100644 (file)
--- a/sdk/cwl/tests/test_job.py
+++ b/sdk/cwl/tests/test_job.py
@@ -14,7 +14,7 @@ from arvados.errors import ApiError
 from schema_salad.ref_resolver import Loader
 from schema_salad.sourceline import cmap
 from .mock_discovery import get_rootDesc
-from .matcher import JsonDiffMatcher
+from .matcher import JsonDiffMatcher, StripYAMLComments
 
 if not os.getenv('ARVADOS_DEBUG'):
     logging.getLogger('arvados.cwl-runner').setLevel(logging.WARN)
@@ -333,7 +333,7 @@ class TestWorkflow(unittest.TestCase):
         it.next().run()
 
         with open("tests/wf/scatter2_subwf.cwl") as f:
-            subwf = f.read()
+            subwf = StripYAMLComments(f.read())
 
         runner.api.jobs().create.assert_called_with(
             body=JsonDiffMatcher({

diff --git a/sdk/cwl/tests/test_submit.py b/sdk/cwl/tests/test_submit.py
index 2e682830b4c2364ebeefeafa1b179c0f0d551d91..83a75b6941b664fb902e65cd1b28a965ab9ef226 100644 (file)
--- a/sdk/cwl/tests/test_submit.py
+++ b/sdk/cwl/tests/test_submit.py
@@ -14,7 +14,7 @@ import arvados_cwl
 import arvados_cwl.runner
 import arvados.keep
 
-from .matcher import JsonDiffMatcher
+from .matcher import JsonDiffMatcher, StripYAMLComments
 from .mock_discovery import get_rootDesc
 
 import ruamel.yaml as yaml
@@ -1017,7 +1017,8 @@ class TestCreateTemplate(unittest.TestCase):
 
 class TestCreateWorkflow(unittest.TestCase):
     existing_workflow_uuid = "zzzzz-7fd4e-validworkfloyml"
-    expect_workflow = open("tests/wf/expect_packed.cwl").read()
+    expect_workflow = StripYAMLComments(
+        open("tests/wf/expect_packed.cwl").read())
 
     @stubs
     def test_create(self, stubs):
@@ -1164,7 +1165,8 @@ class TestCreateWorkflow(unittest.TestCase):
             capture_stdout, sys.stderr, api_client=stubs.api)
         self.assertEqual(exited, 0)
 
-        expect_workflow = open("tests/collection_per_tool/collection_per_tool_packed.cwl").read()
+        toolfile = "tests/collection_per_tool/collection_per_tool_packed.cwl"
+        expect_workflow = StripYAMLComments(open(toolfile).read())
 
         body = {
             "workflow": {