lib/model: Fix test flakyness regression (ref #5592) #5718
Merged
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
imsodin
force-pushed
the
model/flakeTestRegr
branch
from
3a717ab
to
df1c4a9
Compare
calmh
approved these changes
May 18, 2019
calmh
added a commit
to calmh/syncthing
that referenced
this pull request
May 23, 2019
* master: (25 commits) gui, man, authors: Update docs, translations, and contributors lib/model: Consistently cleanup model in tests (syncthing#5724) golang-ci: Turn up the heat cmd/ursrv: Lint fixes build(deps): bump github.com/prometheus/client_golang (syncthing#5729) lib/model, lib/testutils: Test closing a connection on folder restart (syncthing#5707) lib/model: Fix test flakyness regression (ref syncthing#5592) (syncthing#5718) test: Report time per MiB on transfer benchs (syncthing#5711) docker: Create entrypoint script (fixes syncthing#5631) (syncthing#5635) lib/model: Refactor file deletions when pulling (syncthing#5699) cmd/ursrv: Add F-droid and some third party distributors to the distrubtion summary lib/api, lib/connections, gui: Show connection error for disconnected devices (fixes syncthing#3345) (syncthing#5727) authors: Update acolomb (fixes syncthing#5726) cmd/ursrv: Summarize known distribution channels gui, man, authors: Update docs, translations, and contributors lib/model: Remove superfluous check for IndexID in remote ClusterConfig (syncthing#5717) build(deps): bump github.com/lib/pq from 1.0.0 to 1.1.1 (syncthing#5714) build(deps): bump github.com/oschwald/geoip2-golang from 1.1.0 to 1.3.0 (syncthing#5713) build(deps): bump github.com/mattn/go-isatty from 0.0.4 to 0.0.7 (syncthing#5712) build(deps): bump github.com/gogo/protobuf from 1.2.0 to 1.2.1 (syncthing#5715) ...
st-review
added
the
frozen-due-to-age
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
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.
I did some changes on model tests and got weird flaky errors, that turned out to be completely unrelated to these changes, but a test race condition introduced in #5592. This does only affect tests that do the dirty trick of exchange the ignores object in the model map, no problem in code whatsover. Previously it was enough to change the ignores object on model, now we need to make sure we change it after the folder is added, but before it's started, as it is passed to the folder instead of the folder getting it from the model.
I also took the opportunity to move
alwaysChangedto the utilities file.