Daira Hopwood [Sat, 24 Oct 2015 00:14:56 +0000 (01:14 +0100)]
replace_file should allow the replaced file not to exist on Windows.
Signed-off-by: Daira Hopwood <daira@jacaranda.org>
Daira Hopwood [Sat, 24 Oct 2015 00:14:18 +0000 (01:14 +0100)]
Fix fileutil tests.
Signed-off-by: Daira Hopwood <daira@jacaranda.org>
Daira Hopwood [Fri, 23 Oct 2015 22:13:43 +0000 (23:13 +0100)]
More path fixes.
Signed-off-by: Daira Hopwood <daira@jacaranda.org>
Daira Hopwood [Fri, 23 Oct 2015 21:28:35 +0000 (22:28 +0100)]
Fix a test broken by the last commit.
Signed-off-by: Daira Hopwood <daira@jacaranda.org>
Daira Hopwood [Fri, 23 Oct 2015 21:05:34 +0000 (22:05 +0100)]
Don't include [magic_folder]enabled and local.directory fields by default.
Add a comment reminding to do the field modification properly.
Signed-off-by: Daira Hopwood <daira@jacaranda.org>
Daira Hopwood [Fri, 23 Oct 2015 21:04:08 +0000 (22:04 +0100)]
Don't use a long path for the [magic_folder]local.directory field.
Signed-off-by: Daira Hopwood <daira@jacaranda.org>
Daira Hopwood [Fri, 23 Oct 2015 21:02:09 +0000 (22:02 +0100)]
Fix some path Unixisms.
Signed-off-by: Daira Hopwood <daira@jacaranda.org>
Daira Hopwood [Fri, 23 Oct 2015 20:58:39 +0000 (21:58 +0100)]
Add long_path=False option to abspath_expanduser_unicode.
Signed-off-by: Daira Hopwood <daira@jacaranda.org>
Daira Hopwood [Tue, 27 Oct 2015 19:31:22 +0000 (19:31 +0000)]
Fix test_alice_bob.
Signed-off-by: Daira Hopwood <daira@jacaranda.org>
Daira Hopwood [Tue, 27 Oct 2015 19:29:14 +0000 (19:29 +0000)]
Refactor _check_up/downloader_count.
Signed-off-by: Daira Hopwood <daira@jacaranda.org>
Daira Hopwood [Tue, 27 Oct 2015 17:10:15 +0000 (17:10 +0000)]
Don't download the deletion marker file unnecessarily.
Signed-off-by: Daira Hopwood <daira@jacaranda.org>
Daira Hopwood [Tue, 27 Oct 2015 17:09:40 +0000 (17:09 +0000)]
Distinguish deletion of directories.
Signed-off-by: Daira Hopwood <daira@jacaranda.org>
Daira Hopwood [Tue, 27 Oct 2015 17:14:25 +0000 (17:14 +0000)]
Rename deleted files to .backup rather than unlinking them.
Signed-off-by: Daira Hopwood <daira@jacaranda.org>
David Stainton [Tue, 27 Oct 2015 09:59:29 +0000 (10:59 +0100)]
Add file conflict unit test
David Stainton [Tue, 27 Oct 2015 08:44:01 +0000 (09:44 +0100)]
Add basic bob upload test and fix conflict detect
David Stainton [Tue, 27 Oct 2015 08:18:50 +0000 (09:18 +0100)]
Fix bob's uploading test...
David Stainton [Mon, 26 Oct 2015 23:17:47 +0000 (00:17 +0100)]
Attempt to teach bob to upload a file
David Stainton [Mon, 26 Oct 2015 20:59:56 +0000 (21:59 +0100)]
Count conflicted objects
Daira Hopwood [Tue, 27 Oct 2015 18:44:45 +0000 (18:44 +0000)]
Basic remote conflict detection based on ancestor uri
Signed-off-by: Daira Hopwood <daira@jacaranda.org>
Daira Hopwood [Tue, 27 Oct 2015 01:54:54 +0000 (01:54 +0000)]
magic-folder.rst: remove "Known Issues and Limitations" that have been fixed.
Signed-off-by: Daira Hopwood <daira@jacaranda.org>
Daira Hopwood [Tue, 27 Oct 2015 01:53:50 +0000 (01:53 +0000)]
magic-folder.rst: update introduction.
Signed-off-by: Daira Hopwood <daira@jacaranda.org>
Daira Hopwood [Tue, 27 Oct 2015 01:20:28 +0000 (01:20 +0000)]
Avoid .format, since it is inconsistent between Python 2.6 and 2.7 (and the rest of Tahoe-LAFS doesn't use it).
Signed-off-by: Daira Hopwood <daira@jacaranda.org>
Daira Hopwood [Mon, 26 Oct 2015 18:51:30 +0000 (18:51 +0000)]
Fix test_alice_bob.
Signed-off-by: Daira Hopwood <daira@jacaranda.org>
Daira Hopwood [Mon, 26 Oct 2015 18:51:09 +0000 (18:51 +0000)]
Add counter for uploader.objects_not_uploaded.
Signed-off-by: Daira Hopwood <daira@jacaranda.org>
Daira Hopwood [Mon, 26 Oct 2015 18:11:12 +0000 (18:11 +0000)]
Advance Bob's clock after notifying.
Signed-off-by: Daira Hopwood <daira@jacaranda.org>
Daira Hopwood [Mon, 26 Oct 2015 18:10:53 +0000 (18:10 +0000)]
test_alice_bob: use magic= argument to notify, rather than self.magicfolder.
Signed-off-by: Daira Hopwood <daira@jacaranda.org>
meejah [Mon, 26 Oct 2015 18:01:03 +0000 (12:01 -0600)]
add excluded check
meejah [Mon, 26 Oct 2015 17:25:56 +0000 (11:25 -0600)]
add the 'spurious' notifies
Daira Hopwood [Mon, 26 Oct 2015 17:22:13 +0000 (17:22 +0000)]
Fix a pyflakes warning and check existence of file in Bob's local dir.
Signed-off-by: Daira Hopwood <daira@jacaranda.org>
meejah [Thu, 8 Oct 2015 19:00:25 +0000 (13:00 -0600)]
implement 'delete' functionality, with tests
meejah [Thu, 8 Oct 2015 18:51:21 +0000 (12:51 -0600)]
smoketest for magic-folder functionality
Daira Hopwood [Sun, 25 Oct 2015 13:19:13 +0000 (13:19 +0000)]
Describe use of size=None for deleted files. refs ticket:1710.
Signed-off-by: Daira Hopwood <daira@jacaranda.org>
Daira Hopwood [Sun, 25 Oct 2015 13:18:11 +0000 (13:18 +0000)]
Schema change for last_uploaded_uri.
Signed-off-by: Daira Hopwood <daira@jacaranda.org>
Daira Hopwood [Sun, 25 Oct 2015 13:17:46 +0000 (13:17 +0000)]
Earth Dragons: take into account that the replaced file may not exist.
Signed-off-by: Daira Hopwood <daira@jacaranda.org>
Daira Hopwood [Sun, 25 Oct 2015 13:13:36 +0000 (13:13 +0000)]
Writing a file without a db entry is an overwrite.
Signed-off-by: Daira Hopwood <daira@jacaranda.org>
Daira Hopwood [Sun, 25 Oct 2015 11:18:23 +0000 (11:18 +0000)]
remote-to-local-sync.rst: fix an inconsistency in the representation option table.
Signed-off-by: Daira Hopwood <daira@jacaranda.org>
Daira Hopwood [Thu, 22 Oct 2015 13:30:13 +0000 (14:30 +0100)]
Add test that we don't write files outside the magic folder directory. refs ticket:2506
Signed-off-by: Daira Hopwood <daira@jacaranda.org>
Daira Hopwood [Thu, 22 Oct 2015 13:28:26 +0000 (14:28 +0100)]
Fix infinite loop in should_ignore_path for absolute paths.
Signed-off-by: Daira Hopwood <daira@jacaranda.org>
Daira Hopwood [Thu, 22 Oct 2015 13:27:39 +0000 (14:27 +0100)]
More debug logging.
Signed-off-by: Daira Hopwood <daira@jacaranda.org>
Daira Hopwood [Tue, 20 Oct 2015 20:50:00 +0000 (21:50 +0100)]
Unicode fix for do_join.
Signed-off-by: Daira Hopwood <daira@jacaranda.org>
Daira Hopwood [Tue, 20 Oct 2015 20:43:54 +0000 (21:43 +0100)]
Minor cleanups to tests.
Signed-off-by: Daira Hopwood <daira@jacaranda.org>
Daira Hopwood [Tue, 20 Oct 2015 20:37:05 +0000 (21:37 +0100)]
Ensure that errors from Alice-and-Bob tests are reported correctly if setup fails.
Signed-off-by: Daira Hopwood <daira@jacaranda.org>
Daira Hopwood [Tue, 20 Oct 2015 20:36:11 +0000 (21:36 +0100)]
Cosmetics.
Signed-off-by: Daira Hopwood <daira@jacaranda.org>
Daira Hopwood [Tue, 20 Oct 2015 20:19:04 +0000 (21:19 +0100)]
Eliminate duplicate parsing of invite code.
Signed-off-by: Daira Hopwood <daira@jacaranda.org>
Daira Hopwood [Tue, 20 Oct 2015 16:31:03 +0000 (17:31 +0100)]
Remaining test fixes.
Signed-off-by: Daira Hopwood <daira@jacaranda.org>
Daira Hopwood [Tue, 20 Oct 2015 16:30:53 +0000 (17:30 +0100)]
Make sure that do_cli is only called with strs, and avoid unnecessary use of attributes in tests.
Signed-off-by: Daira Hopwood <daira@jacaranda.org>
Daira Hopwood [Tue, 20 Oct 2015 16:27:38 +0000 (17:27 +0100)]
Cosmetics.
Signed-off-by: Daira Hopwood <daira@jacaranda.org>
Daira Hopwood [Tue, 20 Oct 2015 16:16:32 +0000 (17:16 +0100)]
URIs are strs.
Signed-off-by: Daira Hopwood <daira@jacaranda.org>
Daira Hopwood [Tue, 20 Oct 2015 16:13:58 +0000 (17:13 +0100)]
Aliases and nicknames are Unicode.
Signed-off-by: Daira Hopwood <daira@jacaranda.org>
Daira Hopwood [Tue, 20 Oct 2015 14:12:36 +0000 (15:12 +0100)]
Add precondition that arguments to do_cli are strs.
Signed-off-by: Daira Hopwood <daira@jacaranda.org>
Daira Hopwood [Tue, 20 Oct 2015 13:52:00 +0000 (14:52 +0100)]
Fix call to argv_to_abspath. Also rename localdir to local_dir.
Signed-off-by: Daira Hopwood <daira@jacaranda.org>
David Stainton [Tue, 20 Oct 2015 12:27:05 +0000 (14:27 +0200)]
Fix magic-folder cli tests
convert path to abs path when matching
strings in the generated config file.
David Stainton [Tue, 20 Oct 2015 11:08:14 +0000 (13:08 +0200)]
Attempt to fix cli tests
Daira Hopwood [Mon, 19 Oct 2015 17:25:02 +0000 (18:25 +0100)]
Better but still broken tests.
Signed-off-by: Daira Hopwood <daira@jacaranda.org>
Daira Hopwood [Mon, 19 Oct 2015 17:24:33 +0000 (18:24 +0100)]
Fix check for initial '-' in argv_to_abspath.
Signed-off-by: Daira Hopwood <daira@jacaranda.org>
David Stainton [Mon, 19 Oct 2015 14:14:12 +0000 (16:14 +0200)]
Fix tests by submitting unicode args instead of str
David Stainton [Mon, 19 Oct 2015 14:02:28 +0000 (16:02 +0200)]
Teach magic-folder join to use argv_to_abspath
- also we modify argv_to_abspath to through a usage error
if the name starts with a '-'
- add a test
currently the tests fail
David Stainton [Mon, 19 Oct 2015 12:14:32 +0000 (14:14 +0200)]
Use argv_to_abspath for magic-folder join file path arg
Daira Hopwood [Fri, 16 Oct 2015 19:39:39 +0000 (20:39 +0100)]
Test creation of a subdirectory.
Signed-off-by: Daira Hopwood <daira@jacaranda.org>
Daira Hopwood [Fri, 16 Oct 2015 15:21:50 +0000 (16:21 +0100)]
Watch for IN_CREATE events but filter them out for non-directories.
Signed-off-by: Daira Hopwood <daira@jacaranda.org>
Daira Hopwood [Fri, 16 Oct 2015 02:27:59 +0000 (03:27 +0100)]
Patch Downloader.REMOTE_SCAN_INTERVAL rather than setting it persistently.
Signed-off-by: Daira Hopwood <daira@jacaranda.org>
Daira Hopwood [Fri, 16 Oct 2015 02:27:20 +0000 (03:27 +0100)]
Implement creating local directories in downloader.
Signed-off-by: Daira Hopwood <daira@jacaranda.org>
Daira Hopwood [Fri, 16 Oct 2015 02:25:45 +0000 (03:25 +0100)]
Decode names in the scanned remote.
Signed-off-by: Daira Hopwood <daira@jacaranda.org>
Daira Hopwood [Fri, 16 Oct 2015 02:24:46 +0000 (03:24 +0100)]
Refactoring to allow logging from _write_downloaded_file and _rename_conflicted_file.
Signed-off-by: Daira Hopwood <daira@jacaranda.org>
Daira Hopwood [Thu, 15 Oct 2015 22:02:30 +0000 (23:02 +0100)]
Simplify and fix non-existent-file handling.
Also make the existent and non-existent cases as similar as possible,
with a view to merging them.
Signed-off-by: Daira Hopwood <daira@jacaranda.org>
Daira Hopwood [Thu, 15 Oct 2015 22:02:07 +0000 (23:02 +0100)]
Logging/debugging improvements.
Signed-off-by: Daira Hopwood <daira@jacaranda.org>
Daira Hopwood [Thu, 15 Oct 2015 21:56:38 +0000 (22:56 +0100)]
Refactor and fix race conditions in test_alice_bob.
Signed-off-by: Daira Hopwood <daira@jacaranda.org>
Daira Hopwood [Tue, 13 Oct 2015 14:56:31 +0000 (15:56 +0100)]
Correct a call to did_upload_version in the downloader.
Signed-off-by: Daira Hopwood <daira@jacaranda.org>
Daira Hopwood [Tue, 13 Oct 2015 14:56:00 +0000 (15:56 +0100)]
Make sure that test_move_tree waits until files have been uploaded as well as downloaded.
Signed-off-by: Daira Hopwood <daira@jacaranda.org>
Daira Hopwood [Tue, 13 Oct 2015 14:55:00 +0000 (15:55 +0100)]
Restore a call to increment files_uploaded that was mistakenly removed.
Signed-off-by: Daira Hopwood <daira@jacaranda.org>
David Stainton [Mon, 12 Oct 2015 18:07:39 +0000 (20:07 +0200)]
Teach uploader+downloader to use to db schema
here we attempt to fix all the unit tests as well...
however two tests still fail
Daira Hopwood [Thu, 8 Oct 2015 15:01:46 +0000 (16:01 +0100)]
Add magicfolderdb.py.
Signed-off-by: Daira Hopwood <daira@jacaranda.org>
David Stainton [Thu, 8 Oct 2015 14:33:27 +0000 (16:33 +0200)]
Remove magic-folder db code from backupdb.py
David Stainton [Wed, 7 Oct 2015 16:45:44 +0000 (18:45 +0200)]
WIP
David Stainton [Tue, 6 Oct 2015 16:11:08 +0000 (18:11 +0200)]
Include brief summary of magic-folder CLI commands
David Stainton [Tue, 6 Oct 2015 16:04:16 +0000 (18:04 +0200)]
Add link to our cli design doc
David Stainton [Tue, 6 Oct 2015 15:57:18 +0000 (17:57 +0200)]
Mention gc is not part of the otf grant and link to the gc ticket
David Stainton [Tue, 6 Oct 2015 15:52:26 +0000 (17:52 +0200)]
Remove old obsolete/inaccurate statements
David Stainton [Mon, 5 Oct 2015 11:54:38 +0000 (13:54 +0200)]
Minor comment correction for get_all_relpaths
David Stainton [Mon, 5 Oct 2015 10:59:58 +0000 (12:59 +0200)]
For all downloaded files ensure parent dir exists
Daira Hopwood [Thu, 8 Oct 2015 13:42:47 +0000 (14:42 +0100)]
Simplify the cleanup_Alice_and_Bob callback.
Signed-off-by: Daira Hopwood <daira@jacaranda.org>
meejah [Thu, 8 Oct 2015 02:32:19 +0000 (20:32 -0600)]
Make downloader delay a class-variable
This gives the integration-style CLI-based tests a chance
to set the delay to 0 before the first 3-second delayed
call is queued to _lazy_tail in the Downloader
meejah [Wed, 7 Oct 2015 23:03:28 +0000 (17:03 -0600)]
Teach unit-tests to time-warp
1. Split alice/bob clocks to avoid races conditions
in the tests
2. Wrap ._notify so we can advance the clock after inotify
calls in the RealTest (since it takes >0ms to do the "real" notifies)
meejah [Tue, 6 Oct 2015 20:11:32 +0000 (14:11 -0600)]
Fix call to ready()
Daira Hopwood [Fri, 2 Oct 2015 21:08:54 +0000 (22:08 +0100)]
Correct a string-type error.
Signed-off-by: Daira Hopwood <daira@jacaranda.org>
Daira Hopwood [Thu, 1 Oct 2015 21:40:10 +0000 (22:40 +0100)]
WIP.
Signed-off-by: Daira Hopwood <daira@jacaranda.org>
Daira Hopwood [Thu, 1 Oct 2015 21:36:18 +0000 (22:36 +0100)]
Magic Folder file moves.
Signed-off-by: Daira Hopwood <daira@jacaranda.org>
Daira Hopwood [Wed, 16 Sep 2015 13:59:49 +0000 (14:59 +0100)]
Prepare to move drop_upload.py to magic_folder.py.
Signed-off-by: Daira Hopwood <daira@jacaranda.org>
Daira Hopwood [Wed, 16 Sep 2015 13:32:13 +0000 (14:32 +0100)]
Move backupdb.py to src/allmydata.
Signed-off-by: Daira Hopwood <daira@jacaranda.org>
Daira Hopwood [Mon, 28 Dec 2015 15:29:57 +0000 (15:29 +0000)]
Rename upload_ready_d to connected_enough_d.
Signed-off-by: Daira Hopwood <daira@jacaranda.org>
Daira Hopwood [Wed, 16 Sep 2015 13:24:10 +0000 (14:24 +0100)]
Documentation changes for Magic Folder.
Signed-off-by: Daira Hopwood <daira@jacaranda.org>
Daira Hopwood [Mon, 28 Dec 2015 15:28:05 +0000 (15:28 +0000)]
Teach StorageFarmBroker to fire a deferred when a connection threshold is reached. refs #1449
Signed-off-by: Daira Hopwood <daira@jacaranda.org>
Daira Hopwood [Tue, 28 Apr 2015 19:58:07 +0000 (20:58 +0100)]
Enable Windows inotify support.
Signed-off-by: Daira Hopwood <daira@jacaranda.org>
Daira Hopwood [Tue, 28 Apr 2015 19:13:44 +0000 (20:13 +0100)]
New code for Windows drop-upload support. refs #1431
Signed-off-by: Daira Hopwood <daira@jacaranda.org>
Daira Hopwood [Tue, 28 Apr 2015 19:11:40 +0000 (20:11 +0100)]
Docs for drop-upload on Windows.
Signed-off-by: Daira Hopwood <daira@jacaranda.org>
Daira Hopwood [Tue, 28 Apr 2015 19:52:05 +0000 (20:52 +0100)]
Add magic folder db.
Signed-off-by: Daira Hopwood <daira@jacaranda.org>
Daira Hopwood [Tue, 28 Apr 2015 19:43:09 +0000 (20:43 +0100)]
Unicode path fixes for drop-upload.
Signed-off-by: Daira Hopwood <daira@jacaranda.org>
Daira Hopwood [Fri, 4 Dec 2015 18:01:30 +0000 (18:01 +0000)]
Merge pull request #204 from leif/preferred_peers-rebased3
new feature: preferred storage servers
Daira Hopwood [Thu, 3 Dec 2015 01:05:08 +0000 (01:05 +0000)]
Merge pull request #206 from leif/python27
drop Python 2.6 (.travis.yml, doc, setup.py)
Leif Ryge [Wed, 2 Dec 2015 19:55:59 +0000 (19:55 +0000)]
drop Python 2.6 (.travis.yml, doc, setup.py)
Twisted 15 dropped support for it, which causes Travis CI tests to fail on 2.6.
We still theoretically support older versions of Twisted, so perhaps we should
configure Travis to test with those? I think we should drop Python 2.6 in any
case since distros are all on 2.7 now.
I'm leaving Travis running (and ignoring) the failing PyPy tests because I
don't know why that is there.