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

Magicfolder backup files #448

Merged
merged 3 commits into from
Dec 5, 2017
Merged

Conversation

meejah
Copy link
Contributor

@meejah meejah commented Sep 30, 2017

(Note: this is on top of the "multi-magic folder" branch, so ignore that commit -- and should be re-based once that's merged).

This fixes 2880 along with an integration test. You can trigger the bug the first time (and only this time) you re-start a client after a file has been added (and uploaded) in a magic-folder; then, an unnecessary .backup file will appear.

@meejah
Copy link
Contributor Author

meejah commented Oct 24, 2017

I still have no idea what the windows builder is sad about ...

@codecov-io
Copy link

codecov-io commented Oct 31, 2017

Codecov Report

Merging #448 into master will decrease coverage by 0.04%.
The diff coverage is 93.75%.

Impacted file tree graph

@@            Coverage Diff             @@
##           master     #448      +/-   ##
==========================================
- Coverage    90.1%   90.06%   -0.05%     
==========================================
  Files         144      144              
  Lines       27294    27301       +7     
  Branches     3926     3929       +3     
==========================================
- Hits        24594    24589       -5     
- Misses       1959     1967       +8     
- Partials      741      745       +4
Impacted Files Coverage Δ
src/allmydata/util/deferredutil.py 70.73% <0%> (ø) ⬆️
src/allmydata/frontends/magic_folder.py 85.4% <100%> (+0.13%) ⬆️
src/allmydata/immutable/downloader/share.py 92.82% <0%> (-2.47%) ⬇️
src/allmydata/mutable/servermap.py 93.38% <0%> (-0.81%) ⬇️
src/allmydata/scripts/magic_folder_cli.py 69.64% <0%> (+0.25%) ⬆️
src/allmydata/immutable/upload.py 95.53% <0%> (+0.27%) ⬆️

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update 672475c...6c0c908. Read the comment docs.

@meejah meejah force-pushed the magicfolder-backup-files branch 2 times, most recently from 9ab7c2e to d6011fc Compare November 7, 2017 07:38
@meejah
Copy link
Contributor Author

meejah commented Nov 7, 2017

I don't know how to make codecov un-sad about the missing coverage; that commit did get built by travis -- perhaps that's when codecov was down and it didn't get the memo?

@meejah
Copy link
Contributor Author

meejah commented Nov 7, 2017

Should be good to merge

- remember upload URI so we don't re-download
- account for empty files in "should_download"
- fix 'conflicted' asserts in tests
@warner
Copy link
Member

warner commented Dec 5, 2017

LGTM

@warner warner merged commit 6c0c908 into tahoe-lafs:master Dec 5, 2017
@meejah meejah deleted the magicfolder-backup-files branch December 5, 2017 19:50
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
3 participants