This repository has been archived by the owner on Jan 27, 2020. It is now read-only.
Make aggregateChanges more testable. #91
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
This makes the code slightly easier to follow and test. Plus having less arguments is usually better too. Note that the only caller (accumulateChanges) already checks that paths is not empty.
…ment By calling os.Stat aggregateChanges, which is otherwise a pure function, interacts with its environment. Pulling it out into an argument allows us to control the environment much easier by simply mocking it in the unittests.
For example, previously, TestSTEvents would output:
syncwatcher_test.go:384: Invalid result for directory change: test1
syncwatcher_test.go:398: Callback not correctly triggered
Now it shows:
syncwatcher_test.go:384: Invalid result for directory change: (test1) []string{"file1", "file2"}
syncwatcher_test.go:398: Callback not correctly triggered
We can be certain that key exists in trackedPaths.
|
Nice, again a great improvement.
I think this was related to how Syncthing handles the sub scan of deleted items. When we ask it to scan a deleted item it simply ignores the request, so we always need to inform the top dir. Not sure if this is still the case and whether it would work for nested folders.
An integration test with Syncthing would be nice. So launching two sts and st-inotifies, creating a few files, deletes a few dirs and checking if the results match. (It doesn't need to be written in Go per se) |
Zillode
added a commit
that referenced
this pull request
Jan 31, 2016
Make aggregateChanges more testable.
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.
Currently the last test (I guess it's intentional that we notify syncthing about every deleted path.checkAggregation(3, []string{"a/deleted1", "a/deleted2", "a/deleted3", "a/deleted4", "b/deleted1", "b/deleted2"}, []string{"a", "b/deleted1", "b/deleted2"})) fails. Unless I'm missing something I think that the deletes should have been aggregated into the parent dir (
ain this case), but they aren't. Note that althoughtTestDeletesAggregationpasses, in that casesubcontains all 50 files, which I don't think is the intended result. Please correct me if I'm wrong.Also, suggestions for more tests are welcome!