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
David Stainton [Wed, 19 Aug 2015 19:45:20 +0000 (21:45 +0200)]
Fix _scan_remote and remove print statements
Daira Hopwood [Wed, 19 Aug 2015 14:33:52 +0000 (15:33 +0100)]
Fix incorrect order of fields in SQL statement.
My kingdom for a better SQL DSL.
Signed-off-by: Daira Hopwood <daira@jacaranda.org>
Daira Hopwood [Wed, 19 Aug 2015 14:33:08 +0000 (15:33 +0100)]
Cleanup.
Signed-off-by: Daira Hopwood <daira@jacaranda.org>
Daira Hopwood [Wed, 19 Aug 2015 14:32:52 +0000 (15:32 +0100)]
More debug prints.
Signed-off-by: Daira Hopwood <daira@jacaranda.org>
Daira Hopwood [Wed, 19 Aug 2015 13:48:11 +0000 (13:48 +0000)]
Debug prints to diagnose version mismatch after deletion (backupdb).
Daira Hopwood [Wed, 19 Aug 2015 13:31:38 +0000 (13:31 +0000)]
Debug prints to diagnose version mismatch after deletion.
David Stainton [Tue, 18 Aug 2015 14:33:29 +0000 (14:33 +0000)]
Add some print statements.
Ramakrishnan Muthukrishnan [Wed, 12 Aug 2015 09:47:27 +0000 (15:17 +0530)]
test_get_pathinfo: testdir is unnecessary
Use basedir itself, instead of creating another directory inside basedir.
Ramakrishnan Muthukrishnan [Wed, 12 Aug 2015 09:02:40 +0000 (14:32 +0530)]
test_get_pathinfo: rename the identifier d to testdir
d, by convention, is used for the Twisted Deferred objects.
Ramakrishnan Muthukrishnan [Wed, 12 Aug 2015 08:56:52 +0000 (14:26 +0530)]
add more tests for get_pathinfo()
When operating on a file, test if the "file" is not a directory
or a symlink. Likewise for directory and symlink.
Ramakrishnan Muthukrishnan [Wed, 12 Aug 2015 08:43:13 +0000 (14:13 +0530)]
Add test for get_pathinfo()
Daira Hopwood [Tue, 11 Aug 2015 16:02:53 +0000 (17:02 +0100)]
Use get_pathinfo instead of separate os.path.{is*,exists} calls.
Signed-off-by: Daira Hopwood <daira@jacaranda.org>
Daira Hopwood [Tue, 11 Aug 2015 15:02:25 +0000 (16:02 +0100)]
Extend get_pathinfo to add size, ctime and mtime.
Signed-off-by: Daira Hopwood <daira@jacaranda.org>
Daira Hopwood [Tue, 11 Aug 2015 14:46:31 +0000 (15:46 +0100)]
Remove an unnecessary precondition and an incorrect comment.
Signed-off-by: Daira Hopwood <daira@jacaranda.org>
Daira Hopwood [Tue, 11 Aug 2015 14:43:01 +0000 (15:43 +0100)]
Add fileutil.get_pathinfo function.
Signed-off-by: Daira Hopwood <daira@jacaranda.org>
Daira Hopwood [Tue, 11 Aug 2015 14:21:10 +0000 (15:21 +0100)]
Extract get_metadata and get_filenode to methods of Uploader.
Signed-off-by: Daira Hopwood <daira@jacaranda.org>
Daira Hopwood [Tue, 11 Aug 2015 14:19:05 +0000 (15:19 +0100)]
Processing symlinks and special files should not be an error.
Signed-off-by: Daira Hopwood <daira@jacaranda.org>
Daira Hopwood [Tue, 11 Aug 2015 14:17:16 +0000 (15:17 +0100)]
Refactor uploader by inlining _add_file into _process._maybe_upload.
Signed-off-by: Daira Hopwood <daira@jacaranda.org>
Daira Hopwood [Tue, 11 Aug 2015 14:09:56 +0000 (15:09 +0100)]
Refactor uploader by inlining _add_file into _process._maybe_upload.
Signed-off-by: Daira Hopwood <daira@jacaranda.org>
Daira Hopwood [Tue, 11 Aug 2015 14:06:27 +0000 (15:06 +0100)]
Refactor uploader by extracting _process_child to a top-level method.
Signed-off-by: Daira Hopwood <daira@jacaranda.org>
Daira Hopwood [Tue, 11 Aug 2015 14:04:36 +0000 (15:04 +0100)]
Swap two checks to clarify which is failing.
Signed-off-by: Daira Hopwood <daira@jacaranda.org>
David Stainton [Fri, 31 Jul 2015 22:55:15 +0000 (15:55 -0700)]
fix code that adds version number of deleted file to magic-folder db
David Stainton [Fri, 31 Jul 2015 22:08:35 +0000 (15:08 -0700)]
enable version checking tests - currently a righteous fail
David Stainton [Fri, 31 Jul 2015 22:06:12 +0000 (15:06 -0700)]
make various changes - work in progress
David Stainton [Fri, 31 Jul 2015 18:09:30 +0000 (11:09 -0700)]
add version checking to alice bob test
David Stainton [Fri, 31 Jul 2015 17:51:19 +0000 (10:51 -0700)]
Update magic-folder db after download
David Stainton [Thu, 30 Jul 2015 21:13:39 +0000 (14:13 -0700)]
Add final download to alice bob test
- that is to say after alice deletes the file she rewrites it
and this causes bob to download this latest version
David Stainton [Thu, 30 Jul 2015 20:57:29 +0000 (13:57 -0700)]
Remove old unused append to deque function from downloader
Daira Hopwood [Thu, 30 Jul 2015 17:52:05 +0000 (18:52 +0100)]
WIP to unify queue processing between uploader and downloader.
Signed-off-by: Daira Hopwood <daira@jacaranda.org>
Daira Hopwood [Thu, 30 Jul 2015 17:12:50 +0000 (18:12 +0100)]
Repair tests.
Signed-off-by: Daira Hopwood <daira@jacaranda.org>
Daira Hopwood [Thu, 30 Jul 2015 17:04:44 +0000 (18:04 +0100)]
Move uploader's _append_to_deque and _turn_deque to QueueMixin.
Signed-off-by: Daira Hopwood <daira@jacaranda.org>
Daira Hopwood [Thu, 30 Jul 2015 17:04:13 +0000 (18:04 +0100)]
Make sure that counter names and log messages include "uploader" or "downloader".
Signed-off-by: Daira Hopwood <daira@jacaranda.org>
Daira Hopwood [Thu, 30 Jul 2015 15:24:57 +0000 (16:24 +0100)]
Trivial fix.
Signed-off-by: Daira Hopwood <daira@jacaranda.org>
David Stainton [Wed, 29 Jul 2015 00:52:27 +0000 (17:52 -0700)]
remove debugging print statements
David Stainton [Wed, 29 Jul 2015 00:46:46 +0000 (17:46 -0700)]
Fix alice bob test
David Stainton [Wed, 29 Jul 2015 00:02:51 +0000 (17:02 -0700)]
Teach downloader to stop when told to stop
David Stainton [Tue, 28 Jul 2015 18:09:35 +0000 (11:09 -0700)]
Add logic to only add object to download queue when appropriate
David Stainton [Tue, 28 Jul 2015 00:00:39 +0000 (17:00 -0700)]
wip
Daira Hopwood [Mon, 27 Jul 2015 16:51:40 +0000 (17:51 +0100)]
Try to fix some tests - WIP.
Signed-off-by: Daira Hopwood <daira@jacaranda.org>
Daira Hopwood [Mon, 27 Jul 2015 16:51:25 +0000 (17:51 +0100)]
Rename and refactor path variables to be more consistent.
Signed-off-by: Daira Hopwood <daira@jacaranda.org>
David Stainton [Fri, 24 Jul 2015 22:12:57 +0000 (15:12 -0700)]
WIP - fix some bugs
Daira Hopwood [Thu, 23 Jul 2015 23:27:26 +0000 (00:27 +0100)]
Refactor MagicFolder into Uploader and Downloader classes (WIP). refs ticket:2477
Signed-off-by: Daira Hopwood <daira@jacaranda.org>
Daira Hopwood [Thu, 23 Jul 2015 22:15:24 +0000 (23:15 +0100)]
Simplify and document the type of MagicFolder._download_scan_batch.
Signed-off-by: Daira Hopwood <daira@jacaranda.org>
Daira Hopwood [Thu, 23 Jul 2015 21:53:16 +0000 (22:53 +0100)]
Remove redundant call to abspath_expanduser_unicode.
Signed-off-by: Daira Hopwood <daira@jacaranda.org>
Daira Hopwood [Mon, 20 Jul 2015 22:46:03 +0000 (23:46 +0100)]
Reduce code duplication and make sure errors from delegate commands are output.
Signed-off-by: Daira Hopwood <daira@jacaranda.org>
Daira Hopwood [Mon, 20 Jul 2015 22:03:02 +0000 (23:03 +0100)]
Change INVITE_SEPARATOR to '+'.
Signed-off-by: Daira Hopwood <daira@jacaranda.org>
Daira Hopwood [Mon, 20 Jul 2015 22:01:44 +0000 (23:01 +0100)]
Rename MagicFolderCLITestMixin to MagicFolderTestMixin.
Signed-off-by: Daira Hopwood <daira@jacaranda.org>
Daira Hopwood [Mon, 20 Jul 2015 17:13:08 +0000 (18:13 +0100)]
Fix tests.
Signed-off-by: Daira Hopwood <daira@jacaranda.org>
Daira Hopwood [Mon, 20 Jul 2015 16:31:39 +0000 (17:31 +0100)]
Add checks (that currently fail) for version in local db.
Signed-off-by: Daira Hopwood <daira@jacaranda.org>
Daira Hopwood [Mon, 20 Jul 2015 16:30:56 +0000 (17:30 +0100)]
Use relative paths in magic folder db.
Signed-off-by: Daira Hopwood <daira@jacaranda.org>
Daira Hopwood [Mon, 20 Jul 2015 16:27:57 +0000 (17:27 +0100)]
WIP
Signed-off-by: Daira Hopwood <daira@jacaranda.org>
Daira Hopwood [Thu, 16 Jul 2015 17:41:44 +0000 (18:41 +0100)]
Fix some pyflakes errors and warnings.
Signed-off-by: Daira Hopwood <daira@jacaranda.org>
Daira Hopwood [Thu, 16 Jul 2015 16:55:02 +0000 (17:55 +0100)]
Repair backupdb.
Signed-off-by: Daira Hopwood <daira@jacaranda.org>
David Stainton [Wed, 15 Jul 2015 23:54:26 +0000 (16:54 -0700)]
fix bug in test_errors and add test
- test that we report the correct error when
a write cap is passed as a collective dircap
David Stainton [Wed, 15 Jul 2015 23:16:33 +0000 (16:16 -0700)]
add kw arg to _get_count for tests
David Stainton [Wed, 15 Jul 2015 22:43:53 +0000 (15:43 -0700)]
make test_magic_folder use non-ascii chars in nickname
David Stainton [Wed, 15 Jul 2015 22:37:40 +0000 (15:37 -0700)]
Make alice bob test use non-ascii chars in nicknames
David Stainton [Wed, 15 Jul 2015 22:33:33 +0000 (15:33 -0700)]
add comments and blank lines to make setup_alice_and_bob more readable
David Stainton [Wed, 15 Jul 2015 22:29:52 +0000 (15:29 -0700)]
rename to do_invite and do_join for tests
David Stainton [Wed, 15 Jul 2015 22:23:09 +0000 (15:23 -0700)]
rename to do_create_magic_folder for tests
David Stainton [Wed, 15 Jul 2015 22:16:52 +0000 (15:16 -0700)]
revert previous additional blank line
David Stainton [Wed, 15 Jul 2015 22:15:33 +0000 (15:15 -0700)]
wrap long import line
David Stainton [Wed, 15 Jul 2015 22:14:18 +0000 (15:14 -0700)]
wrap long line and spell magic folder without hyphen