Skip to content

Conversation

mr-c
Copy link
Member

@mr-c mr-c commented Sep 9, 2021

  • wait for ratification of CWL v1.2.1

@tetron I think I was too tired when I tested this before; here is a simpler example!

@mr-c mr-c requested a review from tetron September 9, 2021 13:55
@mr-c
Copy link
Member Author

mr-c commented Sep 9, 2021

Here is the log from running the rests without the fix:

[gw0] linux -- Python 3.9.7 /home/michael/cwltool/env3.9/bin/python3

version = '1_0'

    @pytest.mark.parametrize("version", ["1_0", "1_1", "1_2"])
    def test_array_items_typedsl(version) -> None:
        """Demonstrate that 'type: array, items: SomeType[]' works."""
        err_code, _, stderr = get_main_output(
            [
                get_data(f"tests/wf/nested_typedsl_v{version}.cwl"),
                get_data("tests/wf/nested_typedsl_job.yml"),
            ]
        )
>       assert err_code == 0
E       assert 1 == 0
E         +1
E         -0

tests/test_examples.py:1601: AssertionError
----------------------------------------------------------------------------- Captured log call -----------------------------------------------------------------------------
INFO     cwltool:main.py:973  3.1.20210906152048
INFO     cwltool:load_tool.py:101 Resolved '/home/michael/cwltool/tests/wf/nested_typedsl_v1_0.cwl' to 'file:///home/michael/cwltool/tests/wf/nested_typedsl_v1_0.cwl'
ERROR    cwltool:main.py:1142 Tool definition failed validation:
tests/wf/nested_typedsl_v1_0.cwl:5:1: checking field `inputs`
tests/wf/nested_typedsl_v1_0.cwl:6:3:   checking object `tests/wf/nested_typedsl_v1_0.cwl#cat_in`
tests/wf/nested_typedsl_v1_0.cwl:7:5:     Field `items` references unknown identifier `File[]`,
                                          tried
                                          file:///home/michael/cwltool/tests/wf/nested_typedsl_v1_0.cwl#File[]
                                          checking field `type`
tests/wf/nested_typedsl_v1_0.cwl:9:7:       Field `items` references unknown identifier `File[]`,
                                            tried
                                            file:///home/michael/cwltool/tests/wf/nested_typedsl_v1_0.cwl#File[]
_______________________________________________________________________ test_array_items_typedsl[1_2] _______________________________________________________________________
[gw2] linux -- Python 3.9.7 /home/michael/cwltool/env3.9/bin/python3

version = '1_2'

    @pytest.mark.parametrize("version", ["1_0", "1_1", "1_2"])
    def test_array_items_typedsl(version) -> None:
        """Demonstrate that 'type: array, items: SomeType[]' works."""
        err_code, _, stderr = get_main_output(
            [
                get_data(f"tests/wf/nested_typedsl_v{version}.cwl"),
                get_data("tests/wf/nested_typedsl_job.yml"),
            ]
        )
>       assert err_code == 0
E       assert 1 == 0
E         +1
E         -0

tests/test_examples.py:1601: AssertionError
----------------------------------------------------------------------------- Captured log call -----------------------------------------------------------------------------
INFO     cwltool:main.py:973  3.1.20210906152048
INFO     cwltool:load_tool.py:101 Resolved '/home/michael/cwltool/tests/wf/nested_typedsl_v1_2.cwl' to 'file:///home/michael/cwltool/tests/wf/nested_typedsl_v1_2.cwl'
ERROR    cwltool:main.py:1142 Tool definition failed validation:
tests/wf/nested_typedsl_v1_2.cwl:5:1: checking field `inputs`
tests/wf/nested_typedsl_v1_2.cwl:6:3:   checking object `tests/wf/nested_typedsl_v1_2.cwl#cat_in`
tests/wf/nested_typedsl_v1_2.cwl:7:5:     Field `items` references unknown identifier `File[]`,
                                          tried
                                          file:///home/michael/cwltool/tests/wf/nested_typedsl_v1_2.cwl#File[]
                                          checking field `type`
tests/wf/nested_typedsl_v1_2.cwl:9:7:       Field `items` references unknown identifier `File[]`,
                                            tried
                                            file:///home/michael/cwltool/tests/wf/nested_typedsl_v1_2.cwl#File[]
_______________________________________________________________________ test_array_items_typedsl[1_1] _______________________________________________________________________
[gw1] linux -- Python 3.9.7 /home/michael/cwltool/env3.9/bin/python3

version = '1_1'

    @pytest.mark.parametrize("version", ["1_0", "1_1", "1_2"])
    def test_array_items_typedsl(version) -> None:
        """Demonstrate that 'type: array, items: SomeType[]' works."""
        err_code, _, stderr = get_main_output(
            [
                get_data(f"tests/wf/nested_typedsl_v{version}.cwl"),
                get_data("tests/wf/nested_typedsl_job.yml"),
            ]
        )
>       assert err_code == 0
E       assert 1 == 0
E         +1
E         -0

tests/test_examples.py:1601: AssertionError
----------------------------------------------------------------------------- Captured log call -----------------------------------------------------------------------------
INFO     cwltool:main.py:973  3.1.20210906152048
INFO     cwltool:load_tool.py:101 Resolved '/home/michael/cwltool/tests/wf/nested_typedsl_v1_1.cwl' to 'file:///home/michael/cwltool/tests/wf/nested_typedsl_v1_1.cwl'
ERROR    cwltool:main.py:1142 Tool definition failed validation:
tests/wf/nested_typedsl_v1_1.cwl:5:1: checking field `inputs`
tests/wf/nested_typedsl_v1_1.cwl:6:3:   checking object `tests/wf/nested_typedsl_v1_1.cwl#cat_in`
tests/wf/nested_typedsl_v1_1.cwl:7:5:     Field `items` references unknown identifier `File[]`,
                                          tried
                                          file:///home/michael/cwltool/tests/wf/nested_typedsl_v1_1.cwl#File[]
                                          checking field `type`
tests/wf/nested_typedsl_v1_1.cwl:9:7:       Field `items` references unknown identifier `File[]`,
                                            tried
                                            file:///home/michael/cwltool/tests/wf/nested_typedsl_v1_1.cwl#File[]

@mr-c mr-c force-pushed the arrayschema_typedsl_needed branch from ba39d22 to 36cf29d Compare September 9, 2021 13:59
@codecov
Copy link

codecov bot commented Sep 9, 2021

Codecov Report

All modified and coverable lines are covered by tests ✅

Project coverage is 55.46%. Comparing base (6af9932) to head (bed518b).
Report is 449 commits behind head on main.

❗ There is a different number of reports uploaded between BASE (6af9932) and HEAD (bed518b). Click for more details.

HEAD has 4 uploads less than BASE
Flag BASE (6af9932) HEAD (bed518b)
13 9
Additional details and impacted files
@@             Coverage Diff             @@
##             main    #1515       +/-   ##
===========================================
- Coverage   66.45%   55.46%   -11.00%     
===========================================
  Files          93       47       -46     
  Lines       16541     8294     -8247     
  Branches     4390     2160     -2230     
===========================================
- Hits        10992     4600     -6392     
+ Misses       4401     3147     -1254     
+ Partials     1148      547      -601     

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.

🚀 New features to boost your workflow:
  • ❄️ Test Analytics: Detect flaky tests, report on failures, and find test suite problems.
  • 📦 JS Bundle Analysis: Save yourself from yourself by tracking and limiting bundle sizes in JS merges.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

1 participant