Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Make sure collection is a list if a str is given #69081

Merged
merged 4 commits into from
Apr 28, 2020
Merged

Make sure collection is a list if a str is given #69081

merged 4 commits into from
Apr 28, 2020

Commits on Apr 24, 2020

  1. Make sure collection is a list if a str is given

    @Shrews
    Shrews committed Apr 24, 2020
    Configuration menu
    Copy the full SHA
    dca0397 View commit details
    Browse the repository at this point in the history

  2. Call field validation early on collections 

    Because we are doing work on modifying the collections value before
it is actually validated, we can validate it ourselves early to make
sure the user supplies either a string or list. Dicts are not valid.

The new validation allows us to simplify the _ensure_default_collection()
function. And since the field is now static, we no longer need to specify
a default for it, which also allows us to simplify the function. Since
the default is now removed, we can also remove the sanity/ignore.txt entry
for collectionsearch.py.

New unit tests are added (and the existing one modified) that allow us to
make sure that we throw a parser error if a user specifies something other
than a string or list for the collections value everywhere it can be specified.
    @Shrews
    Shrews committed Apr 24, 2020
    Configuration menu
    Copy the full SHA
    1ea7ada View commit details
    Browse the repository at this point in the history

  3. Revert removing the collection default 

    The default is actually used, so restore it.
    @Shrews
    Shrews committed Apr 24, 2020
    Configuration menu
    Copy the full SHA
    77f21b4 View commit details
    Browse the repository at this point in the history

  4. Fix unit tests in test_helpers.py affected by early collection valida… 

    …tion
    @Shrews
    Shrews committed Apr 24, 2020
    Configuration menu
    Copy the full SHA
    4e76a2b View commit details
    Browse the repository at this point in the history