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.

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

Fix discovery getting stuck on 403/503 reply on root item #7136

Merged
merged 2 commits into from
Apr 11, 2019

Conversation

ckamm
Copy link
Contributor

@ckamm ckamm commented Apr 10, 2019

PRing the cleanups/test additions from #7134

Previously if one set the instruction to ERROR while forgetting to set
an error status, it'd propagate as FileIgnored. Now the default is
NormalError for INSTRUCTION_ERROR and FileIgnored for
INSTRUCTION_IGNORE.
@ckamm ckamm added this to the 2.6.0 milestone Apr 10, 2019
@ckamm ckamm requested a review from ogoffart April 10, 2019 09:14
@ckamm ckamm self-assigned this Apr 10, 2019
test/testremotediscovery.cpp Outdated Show resolved Hide resolved
test/testremotediscovery.cpp Outdated Show resolved Hide resolved
Previously these result codes during remote discovery of the sync root
would not cause an error and the discovery would get stuck.

Also extends RemoteDiscovery tests to check for errors on the root item.
@ckamm ckamm force-pushed the discovery-error-on-root branch from 3a34640 to c4837a6 Compare April 11, 2019 11:46
@ckamm ckamm merged commit 440c06c into master Apr 11, 2019
@delete-merged-branch delete-merged-branch bot deleted the discovery-error-on-root branch April 11, 2019 11:49
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.

2 participants