Reduce use of project dir to be more flexible regarding custom test runs #2410
Conversation
This file contains 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
okurz
reviewed
Oct 17, 2019
Codecov Report
@@ Coverage Diff @@
## master #2410 +/- ##
==========================================
+ Coverage 87.13% 87.22% +0.08%
==========================================
Files 169 169
Lines 11086 11075 -11
==========================================
Hits 9660 9660
+ Misses 1426 1415 -11
Continue to review full report at Codecov.
|
okurz
reviewed
Oct 22, 2019
|
Seems like |
* Locate needles relative to the job's needles directory (keeping legacy
way to locate needles as a fallback for compatibility)
* Don't try to update needles which can not be located
* Don't use OpenQA::Utils::needle_info() to locate needles in file
API
* It is not required to parse the needle JSON here
* The comment stating the needle path comes from the database
was wrong. It was only deduced via needledir() which is now
used directly.
* No longer pass the project dir to isotovideo
* See https://progress.opensuse.org/issues/56789
and https://progress.opensuse.org/issues/58184
|
I changed the needle lookup in By the way, the local |
okurz
approved these changes
Oct 23, 2019
The function is only used within that controller anymore.
This seems to be required at least for the test fixture needles used within our test suite. The previous needle_info() function had the same fallback.
The _basic_needle_info function already produces a log message in the different error cases.
|
This breaks needlediff in the web UI for needles in subdirectories: |
AdamWill
added a commit
to AdamWill/openQA
that referenced
this pull request
Nov 1, 2019
As discussed in the POO, this was broken by PR os-autoinst#2410 commit 36aa974 - it assumes you can always find a needle simply by sticking the needle filename on the end of a `needledir` call, but you can't, needles are allowed to be in subdirectories of needledir. This should hopefully fix that without breaking the custom run case by using the *whole* of the JSON file path - we just figure out the subdirectory component from it. This works for me in the 'needle is in a subdirectory of the normal needle dir' case, but I didn't test it in the custom run case. Signed-off-by: Adam Williamson <awilliam@redhat.com>
AdamWill
added a commit
to AdamWill/openQA
that referenced
this pull request
Nov 4, 2019
As discussed in the POO, this was broken by PR os-autoinst#2410 commit 36aa974 - it assumes you can always find a needle simply by sticking the needle filename on the end of a `needledir` call, but you can't, needles are allowed to be in subdirectories of needledir. This should hopefully fix that without breaking the custom run case by using the *whole* of the JSON file path - we just figure out the subdirectory component from it. This works for me in the 'needle is in a subdirectory of the normal needle dir' case, but I didn't test it in the custom run case. Signed-off-by: Adam Williamson <awilliam@redhat.com>
AdamWill
added a commit
to AdamWill/openQA
that referenced
this pull request
Nov 5, 2019
As discussed in the POO, this was broken by PR os-autoinst#2410 commit 36aa974 - it assumes you can always find a needle simply by sticking the needle filename on the end of a `needledir` call, but you can't, needles are allowed to be in subdirectories of needledir. This should hopefully fix that without breaking the custom run case by using the *whole* of the JSON file path - we just figure out the subdirectory component from it. This works for me in the 'needle is in a subdirectory of the normal needle dir' case, but I didn't test it in the custom run case. Signed-off-by: Adam Williamson <awilliam@redhat.com>
AdamWill
added a commit
to AdamWill/openQA
that referenced
this pull request
Nov 5, 2019
As discussed in the POO, this was broken by PR os-autoinst#2410 commit 36aa974 - it assumes you can always find a needle simply by sticking the needle filename on the end of a `needledir` call, but you can't, needles are allowed to be in subdirectories of needledir. This should hopefully fix that without breaking the custom run case by using the *whole* of the JSON file path - we just figure out the subdirectory component from it. This works for me in the 'needle is in a subdirectory of the normal needle dir' case, but I didn't test it in the custom run case. Signed-off-by: Adam Williamson <awilliam@redhat.com>
AdamWill
added a commit
to AdamWill/openQA
that referenced
this pull request
Nov 5, 2019
As discussed in the POO, this was broken by PR os-autoinst#2410 commit 36aa974 - it assumes you can always find a needle simply by sticking the needle filename on the end of a `needledir` call, but you can't, needles are allowed to be in subdirectories of needledir. This should hopefully fix that without breaking the custom run case by using the *whole* of the JSON file path - we just figure out the subdirectory component from it. This works for me in the 'needle is in a subdirectory of the normal needle dir' case, but I didn't test it in the custom run case. Signed-off-by: Adam Williamson <awilliam@redhat.com>
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
The os-autoinst part is still missing.