Daira Hopwood [Wed, 30 Sep 2015 15:16:08 +0000 (16:16 +0100)]
Don't hardcode the encoded form of "/".
Signed-off-by: Daira Hopwood <daira@jacaranda.org>
Daira Hopwood [Wed, 30 Sep 2015 15:15:33 +0000 (16:15 +0100)]
Rename encoded_name_u to encoded_path_u.
Signed-off-by: Daira Hopwood <daira@jacaranda.org>
Daira Hopwood [Wed, 30 Sep 2015 15:31:54 +0000 (16:31 +0100)]
Rename did_upload_file to did_upload_version, and is_new_file_time to is_new_file.
Make them take a PathInfo argument rather than (mtime, ctime, size).
Also treat the size of a nonexistent file as None (SQL NULL) rather than 0.
Signed-off-by: Daira Hopwood <daira@jacaranda.org>
Daira Hopwood [Wed, 30 Sep 2015 15:08:01 +0000 (16:08 +0100)]
Make the PathInfo returned by get_pathinfo for a nonexistent path use "now" for ctime and mtime.
Signed-off-by: Daira Hopwood <daira@jacaranda.org>
Daira Hopwood [Wed, 30 Sep 2015 15:29:05 +0000 (16:29 +0100)]
Cleanups relating to order of mtime and ctime.
Signed-off-by: Daira Hopwood <daira@jacaranda.org>
Daira Hopwood [Wed, 30 Sep 2015 14:52:22 +0000 (15:52 +0100)]
FilePath-related changes. refs ticket:2506
Signed-off-by: Daira Hopwood <daira@jacaranda.org>
David Stainton [Thu, 17 Sep 2015 07:26:00 +0000 (09:26 +0200)]
Teach magic-folder test helpers to use passed in clock
David Stainton [Thu, 17 Sep 2015 06:59:02 +0000 (08:59 +0200)]
Teach magic-folder to use passed in clock instead of global reactor
David Stainton [Fri, 25 Sep 2015 08:39:57 +0000 (10:39 +0200)]
Teach Uploader to ignore files unless they've changed
- specifically we compare the ctime, mtime and size with the
entry in magic-folder db.
David Stainton [Fri, 25 Sep 2015 08:39:27 +0000 (10:39 +0200)]
Fix is_new_file_time by converting floats to int
Daira Hopwood [Thu, 24 Sep 2015 18:44:09 +0000 (20:44 +0200)]
Fix an oversight in the design doc.
David Stainton [Thu, 24 Sep 2015 08:25:23 +0000 (10:25 +0200)]
Teach test_alice_bob to fail if local version is wrong
Daira Hopwood [Wed, 23 Sep 2015 14:38:04 +0000 (15:38 +0100)]
Make sure that the 'processed' hook is run for calls to _process from scan.
Signed-off-by: Daira Hopwood <daira@jacaranda.org>
Daira Hopwood [Wed, 23 Sep 2015 14:37:13 +0000 (15:37 +0100)]
Debug prints.
Signed-off-by: Daira Hopwood <daira@jacaranda.org>
Daira Hopwood [Wed, 23 Sep 2015 14:34:15 +0000 (15:34 +0100)]
Improve logging of HookMixin.
Signed-off-by: Daira Hopwood <daira@jacaranda.org>
Daira Hopwood [Wed, 23 Sep 2015 14:05:08 +0000 (15:05 +0100)]
Ignore files with ignorable names.
Signed-off-by: Daira Hopwood <daira@jacaranda.org>
Daira Hopwood [Wed, 23 Sep 2015 13:49:31 +0000 (14:49 +0100)]
Fix an oversight when joining paths.
Signed-off-by: Daira Hopwood <daira@jacaranda.org>
Daira Hopwood [Tue, 22 Sep 2015 15:46:43 +0000 (16:46 +0100)]
Relative paths used by magic folder are '/'-separated on all platforms.
Signed-off-by: Daira Hopwood <daira@jacaranda.org>
Daira Hopwood [Tue, 22 Sep 2015 15:45:34 +0000 (16:45 +0100)]
Make sure that a path is in the pending set before calling Uploader._process on it.
Signed-off-by: Daira Hopwood <daira@jacaranda.org>
Daira Hopwood [Tue, 22 Sep 2015 15:44:25 +0000 (16:44 +0100)]
Make assertions about objects_failed counts.
Signed-off-by: Daira Hopwood <daira@jacaranda.org>
Daira Hopwood [Tue, 22 Sep 2015 15:43:43 +0000 (16:43 +0100)]
Comment out bad/unfinished test code.
Signed-off-by: Daira Hopwood <daira@jacaranda.org>
Daira Hopwood [Tue, 22 Sep 2015 15:42:02 +0000 (16:42 +0100)]
Fix objects_queued counter.
Signed-off-by: Daira Hopwood <daira@jacaranda.org>
Daira Hopwood [Tue, 22 Sep 2015 15:40:53 +0000 (16:40 +0100)]
The type of deque elements differs between the uploader and downloader.
Signed-off-by: Daira Hopwood <daira@jacaranda.org>
Daira Hopwood [Tue, 22 Sep 2015 15:15:14 +0000 (16:15 +0100)]
Debug prints.
Signed-off-by: Daira Hopwood <daira@jacaranda.org>
Daira Hopwood [Tue, 22 Sep 2015 15:13:49 +0000 (16:13 +0100)]
Include client nickname in magic folder log messages.
Signed-off-by: Daira Hopwood <daira@jacaranda.org>
Daira Hopwood [Mon, 21 Sep 2015 16:51:44 +0000 (17:51 +0100)]
Delete process_child.
Signed-off-by: Daira Hopwood <daira@jacaranda.org>
Daira Hopwood [Mon, 21 Sep 2015 16:49:17 +0000 (17:49 +0100)]
Reenable debug prints.
Signed-off-by: Daira Hopwood <daira@jacaranda.org>
Daira Hopwood [Thu, 17 Sep 2015 15:13:36 +0000 (16:13 +0100)]
Fix relative path calculation WIP.
Signed-off-by: Daira Hopwood <daira@jacaranda.org>
Daira Hopwood [Thu, 17 Sep 2015 14:43:09 +0000 (15:43 +0100)]
Enforce that paths are below the magic folder directory -- WIP.
Signed-off-by: Daira Hopwood <daira@jacaranda.org>
David Stainton [Wed, 16 Sep 2015 05:44:09 +0000 (07:44 +0200)]
Remove superfluous debugging print statement
Daira Hopwood [Tue, 15 Sep 2015 18:19:00 +0000 (19:19 +0100)]
Fix another rebasing error.
Signed-off-by: Daira Hopwood <daira@jacaranda.org>
Daira Hopwood [Tue, 15 Sep 2015 17:46:00 +0000 (18:46 +0100)]
Fix an import that broke during rebasing.
Signed-off-by: Daira Hopwood <daira@jacaranda.org>
Daira Hopwood [Tue, 15 Sep 2015 15:43:41 +0000 (16:43 +0100)]
Remove or comment out print statements and improve logging.
Signed-off-by: Daira Hopwood <daira@jacaranda.org>
Daira Hopwood [Tue, 15 Sep 2015 14:59:33 +0000 (15:59 +0100)]
Remove MagicFolderTestMixin._create_magicfolder.
Signed-off-by: Daira Hopwood <daira@jacaranda.org>
Daira Hopwood [Tue, 15 Sep 2015 14:54:35 +0000 (15:54 +0100)]
Remove MagicFolderCLITestMixin.create_magicfolder.
Signed-off-by: Daira Hopwood <daira@jacaranda.org>
Daira Hopwood [Mon, 14 Sep 2015 19:16:24 +0000 (20:16 +0100)]
Minor cleanup.
Signed-off-by: Daira Hopwood <daira@jacaranda.org>
Daira Hopwood [Mon, 14 Sep 2015 19:16:03 +0000 (20:16 +0100)]
Remove redundant inotify parameters to MagicFolder and Uploader constructors.
Signed-off-by: Daira Hopwood <daira@jacaranda.org>
Daira Hopwood [Mon, 14 Sep 2015 19:14:29 +0000 (20:14 +0100)]
Ensure that fake_inotify is used for restarted clients in MockTest.
Signed-off-by: Daira Hopwood <daira@jacaranda.org>
Daira Hopwood [Mon, 14 Sep 2015 17:21:09 +0000 (18:21 +0100)]
Compare size and ctime as well as mtime.
Signed-off-by: Daira Hopwood <daira@jacaranda.org>
Daira Hopwood [Mon, 14 Sep 2015 17:19:34 +0000 (18:19 +0100)]
Fix test bug that accidentally suppressed errors.
Signed-off-by: Daira Hopwood <daira@jacaranda.org>
David Stainton [Mon, 14 Sep 2015 10:41:12 +0000 (12:41 +0200)]
Teach should_ignore_file to require unicode
David Stainton [Mon, 14 Sep 2015 04:29:56 +0000 (06:29 +0200)]
Simply should_ignore_file helper function
David Stainton [Sun, 13 Sep 2015 10:51:57 +0000 (12:51 +0200)]
Activate test_alice_bob test
it was previously renamed to ommit it from unit test runs
David Stainton [Sun, 13 Sep 2015 10:49:29 +0000 (12:49 +0200)]
Remove old debugging print statements
David Stainton [Sat, 12 Sep 2015 18:27:10 +0000 (20:27 +0200)]
WIP
David Stainton [Sat, 12 Sep 2015 18:10:45 +0000 (20:10 +0200)]
remove debug print statements
David Stainton [Sat, 12 Sep 2015 18:09:55 +0000 (20:09 +0200)]
Fix version incrementation bug
only increment if mtimes are differing...
David Stainton [Sat, 12 Sep 2015 18:09:10 +0000 (20:09 +0200)]
Add is_new_file_time db helper function
this is for comparing mtimes
David Stainton [Sat, 12 Sep 2015 14:52:26 +0000 (16:52 +0200)]
Fix bug in Downloader's _get_local_latest
previously the magic-folder path was not prepended
to the file path... thus the file didn't exist and
the call to _get_local_latest returned None.
David Stainton [Sat, 12 Sep 2015 12:02:53 +0000 (14:02 +0200)]
Teach test_persistence to only use one clientdir
This effectively fixes the bug where upon restart the client
uses a different clientdir
David Stainton [Fri, 11 Sep 2015 19:40:15 +0000 (21:40 +0200)]
WIP
David Stainton [Fri, 11 Sep 2015 13:34:19 +0000 (15:34 +0200)]
fix unit test helper _wait_until_started by using ready()
David Stainton [Fri, 11 Sep 2015 11:37:01 +0000 (13:37 +0200)]
Teach test_persistence to upload a 2nd file
test fails...
David Stainton [Wed, 9 Sep 2015 16:12:10 +0000 (18:12 +0200)]
Teach test_persistence to restart client with the new no network grid api changes
David Stainton [Wed, 9 Sep 2015 13:17:23 +0000 (15:17 +0200)]
Add should_ignore_file and tests
This helper function will be used by magic-folder to
determine when to drop a file from the upload queue...
it ignores hidden files and certain suffixed files.
Daira Hopwood [Tue, 8 Sep 2015 14:51:37 +0000 (15:51 +0100)]
Repair test_replace_file for the case where the replaced file did not already exist
(which is no longer considered an error).
Signed-off-by: Daira Hopwood <daira@jacaranda.org>
Daira Hopwood [Tue, 8 Sep 2015 14:30:00 +0000 (15:30 +0100)]
Repair test.
Signed-off-by: Daira Hopwood <daira@jacaranda.org>
Daira Hopwood [Tue, 8 Sep 2015 14:29:48 +0000 (15:29 +0100)]
restart_client needs to remove the old client from its parent, not just stop it.
Signed-off-by: Daira Hopwood <daira@jacaranda.org>
Daira Hopwood [Tue, 8 Sep 2015 14:29:13 +0000 (15:29 +0100)]
startService can be called more than once.
Signed-off-by: Daira Hopwood <daira@jacaranda.org>
Daira Hopwood [Tue, 8 Sep 2015 14:26:42 +0000 (15:26 +0100)]
Comment out some print statements.
Signed-off-by: Daira Hopwood <daira@jacaranda.org>
Daira Hopwood [Tue, 8 Sep 2015 14:26:15 +0000 (15:26 +0100)]
Cleanup of _restart_client.
Signed-off-by: Daira Hopwood <daira@jacaranda.org>
Daira Hopwood [Tue, 8 Sep 2015 14:23:33 +0000 (15:23 +0100)]
Fix a logging bug for Unicode nicknames.
Signed-off-by: Daira Hopwood <daira@jacaranda.org>
Daira Hopwood [Thu, 3 Sep 2015 19:21:54 +0000 (20:21 +0100)]
WIP
Signed-off-by: Daira Hopwood <daira@jacaranda.org>
Daira Hopwood [Thu, 3 Sep 2015 19:21:10 +0000 (20:21 +0100)]
Solve a potential race condition by waiting until the uploader is started.
Signed-off-by: Daira Hopwood <daira@jacaranda.org>
Daira Hopwood [Thu, 3 Sep 2015 19:20:13 +0000 (20:20 +0100)]
Remove self.client and stats_provider attributes which could get out-of-sync with self.get_client().
Signed-off-by: Daira Hopwood <daira@jacaranda.org>
Daira Hopwood [Thu, 3 Sep 2015 19:16:58 +0000 (20:16 +0100)]
Add 'started' hook to Magic Folder uploader.
Signed-off-by: Daira Hopwood <daira@jacaranda.org>
Daira Hopwood [Thu, 3 Sep 2015 19:16:27 +0000 (20:16 +0100)]
Remove unused variables.
Signed-off-by: Daira Hopwood <daira@jacaranda.org>
Daira Hopwood [Thu, 3 Sep 2015 18:42:37 +0000 (19:42 +0100)]
Add _restart_client callback.
Signed-off-by: Daira Hopwood <daira@jacaranda.org>
Daira Hopwood [Thu, 3 Sep 2015 18:41:51 +0000 (19:41 +0100)]
stopService does not necessarily return a Deferred.
Signed-off-by: Daira Hopwood <daira@jacaranda.org>
Daira Hopwood [Thu, 3 Sep 2015 17:29:45 +0000 (18:29 +0100)]
Add a restart_client method to GridTestMixin.
Signed-off-by: Daira Hopwood <daira@jacaranda.org>
Daira Hopwood [Thu, 3 Sep 2015 14:48:48 +0000 (15:48 +0100)]
Rename test_cli_magic_folder.MagicFolderTestMixin to MagicFolderCLITestMixin.
Signed-off-by: Daira Hopwood <daira@jacaranda.org>
Daira Hopwood [Thu, 3 Sep 2015 14:47:20 +0000 (15:47 +0100)]
Add print statements.
Signed-off-by: Daira Hopwood <daira@jacaranda.org>
David Stainton [Wed, 2 Sep 2015 13:10:53 +0000 (15:10 +0200)]
WIP
David Stainton [Tue, 1 Sep 2015 12:35:03 +0000 (14:35 +0200)]
Revert "Attempt to fix test_persistence"
This reverts commit
257d6665d29454351886d9c1125d214b21c324f7.
David Stainton [Mon, 31 Aug 2015 21:38:55 +0000 (23:38 +0200)]
Attempt to fix test_persistence
broken WIP, startup path was broken
David Stainton [Mon, 31 Aug 2015 21:38:31 +0000 (23:38 +0200)]
Add db util function for retrieving all downloaded files
Daira Hopwood [Mon, 31 Aug 2015 17:05:33 +0000 (18:05 +0100)]
More precise and correct error reporting in replace_file.
Signed-off-by: Daira Hopwood <daira@jacaranda.org>
Daira Hopwood [Tue, 15 Sep 2015 17:42:55 +0000 (18:42 +0100)]
Fix path handling in Downloader._process.
Signed-off-by: Daira Hopwood <daira@jacaranda.org>
Daira Hopwood [Tue, 15 Sep 2015 17:39:54 +0000 (18:39 +0100)]
Make _write_downloaded_file return the path of the destination file.
Signed-off-by: Daira Hopwood <daira@jacaranda.org>
Daira Hopwood [Tue, 15 Sep 2015 17:31:20 +0000 (18:31 +0100)]
replace_file should not fail if replaced_path does not exist.
Signed-off-by: Daira Hopwood <daira@jacaranda.org>
Ramakrishnan Muthukrishnan [Mon, 31 Aug 2015 08:24:05 +0000 (13:54 +0530)]
Move the test for _write_download_file() to test_magic_folder module
Ramakrishnan Muthukrishnan [Mon, 31 Aug 2015 07:32:34 +0000 (13:02 +0530)]
WIP: test for _write_downloaded_file
David Stainton [Sat, 29 Aug 2015 11:29:47 +0000 (13:29 +0200)]
more debugging print statements
David Stainton [Fri, 28 Aug 2015 13:19:51 +0000 (15:19 +0200)]
Uncomment alice bob test print statements
David Stainton [Wed, 26 Aug 2015 20:04:49 +0000 (22:04 +0200)]
Remove stupid errback and raise proper conflict exception
David Stainton [Wed, 26 Aug 2015 20:02:26 +0000 (22:02 +0200)]
Fix replace_file; rename only if replaced_path exists
David Stainton [Wed, 26 Aug 2015 15:50:03 +0000 (17:50 +0200)]
Add err print statement to show the conflict...
David Stainton [Wed, 26 Aug 2015 14:50:35 +0000 (16:50 +0200)]
Capture exceptions from conflict and write info in magic folder db
David Stainton [Wed, 26 Aug 2015 13:28:44 +0000 (15:28 +0200)]
Fix _write_downloaded_file by adding base path
David Stainton [Wed, 26 Aug 2015 12:40:08 +0000 (14:40 +0200)]
Correct spelling is os.utime not utimes
Daira Hopwood [Tue, 25 Aug 2015 15:02:36 +0000 (16:02 +0100)]
Add Downloader._write_downloaded_file. refs ticket:2489
Signed-off-by: Daira Hopwood <daira@jacaranda.org>
Daira Hopwood [Mon, 24 Aug 2015 16:53:13 +0000 (17:53 +0100)]
Remove debug prints in backupdb.py.
Signed-off-by: Daira Hopwood <daira@jacaranda.org>
Daira Hopwood [Mon, 24 Aug 2015 16:49:34 +0000 (17:49 +0100)]
Remove or comment out print statements.
Signed-off-by: Daira Hopwood <daira@jacaranda.org>
Daira Hopwood [Mon, 24 Aug 2015 16:41:57 +0000 (17:41 +0100)]
Rename Client.upload_ready_d to connected_enough_d.
Signed-off-by: Daira Hopwood <daira@jacaranda.org>
Daira Hopwood [Mon, 24 Aug 2015 16:17:24 +0000 (17:17 +0100)]
In Downloader._get_collective_latest_file, consume errors when getting metadata.
Signed-off-by: Daira Hopwood <daira@jacaranda.org>
David Stainton [Mon, 24 Aug 2015 11:19:45 +0000 (13:19 +0200)]
Teach uploader to process lazy tail upon stop method
David Stainton [Mon, 24 Aug 2015 11:11:37 +0000 (13:11 +0200)]
Teach magic-folder ready method to return a deferred
Daira Hopwood [Thu, 20 Aug 2015 18:45:49 +0000 (19:45 +0100)]
Fix a bug in Downloader._scan_remote that incorrectly skips subsequent files
(and drops a Deferred) when local version >= remote version.
Also simplify that code and robustify it for the case where the version metadata is missing.
Signed-off-by: Daira Hopwood <daira@jacaranda.org>
Daira Hopwood [Thu, 20 Aug 2015 15:58:55 +0000 (16:58 +0100)]
Use deferredutil.HookMixin to simplify callback for tests.
Signed-off-by: Daira Hopwood <daira@jacaranda.org>
David Stainton [Wed, 19 Aug 2015 19:56:29 +0000 (21:56 +0200)]
Minor fix to alice bob test