[QA-269] retryFetch Fails #1
Merged
Conversation
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
kax-slamcore
force-pushed
the
QA-269-retry-fetch-fails
branch
from
20d710d to
df5f9bf
Compare
| ExpectListdir(dir='source') | ||
| .files(['.git']) | ||
| .exit(0), | ||
| ExpectShell(workdir='source', |
There was a problem hiding this comment.
I may have misunderstood how these tests are working, but why are we expecting an exit code of 1 for this?
There was a problem hiding this comment.
It's not expecting the exit code.
ExpectShell configures a mock which expects the git fetch command and then imitates a non-zero exit code.
There was a problem hiding this comment.
Ah ok, that's handy!
nicolas-slamcore
approved these changes
May 10, 2022
Note that the
`test_mode_full_copy_recursive_fetch_fail_retry_{fail,succeed}` test
both fail to execute an expected second attempt to git fetch, and the
`test_mode_full_copy_recursive_fetch_fail_clobberOnFailure` test fails
to clobber and clone the source directory:
```
$ trial buildbot.test.unit.steps.test_source_git.TestGit
... (etc) ...
test_mode_full_copy_recursive ... [OK]
test_mode_full_copy_recursive_fetch_fail ... [OK]
test_mode_full_copy_recursive_fetch_fail_clobberOnFailure ... [ERROR]
test_mode_full_copy_recursive_fetch_fail_retry_fail ... [ERROR]
test_mode_full_copy_recursive_fetch_fail_retry_succeed ... [ERROR]
```
kax-slamcore
force-pushed
the
QA-269-retry-fetch-fails
branch
from
df5f9bf to
831c2b9
Compare
…requested. In `Git._fetchOrFallback`, the call to `self._fetch(None)` will throw a `BuildStepFailed` if the fetch command fails. The fallback code in `_fetchOrFallback` will not be executed and the fetch will not be retried nor will `clobber()` be called. This change modifies `_fetch` to accept an `abandonOnFailure` flag to control whether it should throw. Test Plan Run the unit tests added in the previous commit.
kax-slamcore
force-pushed
the
QA-269-retry-fetch-fails
branch
from
831c2b9 to
7642e8c
Compare
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.
Fix
retryFetchandclobberOnFailure.As per http://docs.buildbot.net/latest/manual/configuration/steps/source_git.html#
However, this does not currently work.
In
Git._fetchOrFallback, the call toself._fetch(None)will throw aBuildStepFailedif the fetch command fails. The fallback code in_fetchOrFallbackwill not be executed and the fetch will not be retried. Same forclobberOnFailure=Trueif it is requested.This change modifies
_fetchto accept anabandonOnFailureflag to control whether it should throw.Test Plan
In the first commit I've added tests to test_source_git.py for the
retryFetch=Truecase that fail, demonstrating the issue.The second commit fixes the failing tests.
Contributor Checklist:
newsfragmentsdirectory (and read theREADME.txtin that directory)