Allow check_graphic to be more flexible#4370
Merged
bjlittle merged 2 commits intoSciTools:mainfrom Oct 13, 2021
Merged
Conversation
This change allows check_graphic to be more flexible when passed a key that is not fully qualified.
for more information, see https://pre-commit.ci
bjlittle
approved these changes
Oct 13, 2021
Member
bjlittle
left a comment
bjlittle
left a comment
There was a problem hiding this comment.
@jamesp Looks good to me.
There's no harm in being a little bit graceful here when it comes to matching, nice one 👍
Once the CI is happy, then so am I 😄
If you fancy adding a whatsnew entry, that would be cool. However, if you don't want to shout about infrastructure changes, than that's cool too.
tkknight
added a commit
to tkknight/iris
that referenced
this pull request
Nov 3, 2021
* main: (44 commits) [pre-commit.ci] pre-commit autoupdate (SciTools#4395) min pin for numpy (nep29) (SciTools#4386) Updated environment lockfiles (SciTools#4393) Extend stock.mesh api (SciTools#4389) Updated environment lockfiles (SciTools#4388) Integrate ASV with Nox (SciTools#4378) NetCDF save - stream ALL lazy arrays. (SciTools#4375) adopt flake8 maccabe complexity metric (SciTools#4380) Accept inverse_flattening = 0 for spherical ellipsoid (closes SciTools#4146) (SciTools#4368) Updated environment lockfiles (SciTools#4379) Prevent warning in `test_Saver` (SciTools#4376) drop pyugrid in site.cfg (SciTools#4373) `flake8` dependency (SciTools#4371) update latest whosnew (SciTools#4372) Allow `check_graphic` to be more flexible (SciTools#4370) [pre-commit.ci] pre-commit autoupdate (SciTools#4365) Updated environment lockfiles (SciTools#4364) Update latest.rst (SciTools#4362) More clarity on setting `iris-test-data` location. (SciTools#4359) update whatsnew (SciTools#4361) ...
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
🚀 Pull Request
I'm not convinced this is the right way to do this so feedback welcome.
Description
This change allows
check_graphicto be more lenient when passed a key that is not fully qualified.This is to support the VSCode test runner.
imagerepo.jsoncontains fully qualified names, such asiris.tests.test_quickplot.TestLabels.test_contour.0, but when running a specific test from the VSCode GUI, it fails with this error:./test_quickplot.py::TestLabels::test_contour Failed: Missing image test result: test_quickplot.TestLabels.test_contour.0. The way the VSCode test runner loads and runs the unittest it does not fully qualify the package.If an exact match in the imagerepo is not found, a test will fail. This PR will check for partially qualified test image targets. If exactly one match is found in the imagerepo, it will use that and continue. If not, the original logic applies as before this PR.
Consult Iris pull request check list