Commit Graph

6351 Commits

Author SHA1 Message Date
Daira Hopwood
144f4ff5ff Extract get_metadata and get_filenode to methods of Uploader.
Signed-off-by: Daira Hopwood <daira@jacaranda.org>
2015-08-11 15:21:10 +01:00
Daira Hopwood
8eb81b84f2 Processing symlinks and special files should not be an error.
Signed-off-by: Daira Hopwood <daira@jacaranda.org>
2015-08-11 15:19:05 +01:00
Daira Hopwood
b4c0a140e3 Refactor uploader by inlining _add_file into _process._maybe_upload.
Signed-off-by: Daira Hopwood <daira@jacaranda.org>
2015-08-11 15:17:16 +01:00
Daira Hopwood
846d61b894 Refactor uploader by inlining _add_file into _process._maybe_upload.
Signed-off-by: Daira Hopwood <daira@jacaranda.org>
2015-08-11 15:09:56 +01:00
Daira Hopwood
4850c06c4a Refactor uploader by extracting _process_child to a top-level method.
Signed-off-by: Daira Hopwood <daira@jacaranda.org>
2015-08-11 15:06:27 +01:00
Daira Hopwood
0f33e04258 Swap two checks to clarify which is failing.
Signed-off-by: Daira Hopwood <daira@jacaranda.org>
2015-08-11 15:04:36 +01:00
David Stainton
b01bc80117 fix code that adds version number of deleted file to magic-folder db 2015-07-31 15:55:15 -07:00
David Stainton
45b8e578eb enable version checking tests - currently a righteous fail 2015-07-31 15:08:35 -07:00
David Stainton
084b92535c make various changes - work in progress 2015-07-31 15:06:12 -07:00
David Stainton
ea39f11c57 add version checking to alice bob test 2015-07-31 11:09:30 -07:00
David Stainton
12ab89c6b5 Update magic-folder db after download 2015-07-31 10:51:19 -07:00
David Stainton
561ff74fa4 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
2015-07-30 14:13:39 -07:00
David Stainton
2b7e5c1481 Remove old unused append to deque function from downloader 2015-07-30 13:57:29 -07:00
Daira Hopwood
27fe50ff24 WIP to unify queue processing between uploader and downloader.
Signed-off-by: Daira Hopwood <daira@jacaranda.org>
2015-07-30 18:52:05 +01:00
Daira Hopwood
c7091ef6e6 Repair tests.
Signed-off-by: Daira Hopwood <daira@jacaranda.org>
2015-07-30 18:12:50 +01:00
Daira Hopwood
50c2cc575f Move uploader's _append_to_deque and _turn_deque to QueueMixin.
Signed-off-by: Daira Hopwood <daira@jacaranda.org>
2015-07-30 18:04:44 +01:00
Daira Hopwood
b51563fe1e Make sure that counter names and log messages include "uploader" or "downloader".
Signed-off-by: Daira Hopwood <daira@jacaranda.org>
2015-07-30 18:04:13 +01:00
Daira Hopwood
cde94e4eb6 Trivial fix.
Signed-off-by: Daira Hopwood <daira@jacaranda.org>
2015-07-30 16:24:57 +01:00
David Stainton
067edc7793 remove debugging print statements 2015-07-28 17:52:27 -07:00
David Stainton
ecfc33bb05 Fix alice bob test 2015-07-28 17:46:46 -07:00
David Stainton
825e8d9e9a Teach downloader to stop when told to stop 2015-07-28 17:02:51 -07:00
David Stainton
6e42c00c9c Add logic to only add object to download queue when appropriate 2015-07-28 11:09:35 -07:00
David Stainton
3fe005def0 wip 2015-07-27 17:00:39 -07:00
Daira Hopwood
69a5df6fea Try to fix some tests - WIP.
Signed-off-by: Daira Hopwood <daira@jacaranda.org>
2015-07-27 17:51:40 +01:00
Daira Hopwood
8182752333 Rename and refactor path variables to be more consistent.
Signed-off-by: Daira Hopwood <daira@jacaranda.org>
2015-07-27 17:51:25 +01:00
David Stainton
bcfdcf2877 WIP - fix some bugs 2015-07-24 15:12:57 -07:00
Daira Hopwood
3c77914519 Refactor MagicFolder into Uploader and Downloader classes (WIP). refs ticket:2477
Signed-off-by: Daira Hopwood <daira@jacaranda.org>
2015-07-24 00:27:26 +01:00
Daira Hopwood
4045f5844f Simplify and document the type of MagicFolder._download_scan_batch.
Signed-off-by: Daira Hopwood <daira@jacaranda.org>
2015-07-23 23:15:24 +01:00
Daira Hopwood
5e8105fa91 Remove redundant call to abspath_expanduser_unicode.
Signed-off-by: Daira Hopwood <daira@jacaranda.org>
2015-07-23 22:53:16 +01:00
Daira Hopwood
ce2546c471 Reduce code duplication and make sure errors from delegate commands are output.
Signed-off-by: Daira Hopwood <daira@jacaranda.org>
2015-07-21 00:48:11 +01:00
Daira Hopwood
8891b7d550 Change INVITE_SEPARATOR to '+'.
Signed-off-by: Daira Hopwood <daira@jacaranda.org>
2015-07-21 00:48:11 +01:00
Daira Hopwood
6e6a771847 Rename MagicFolderCLITestMixin to MagicFolderTestMixin.
Signed-off-by: Daira Hopwood <daira@jacaranda.org>
2015-07-21 00:48:11 +01:00
Daira Hopwood
fc31a4f5ef Fix tests.
Signed-off-by: Daira Hopwood <daira@jacaranda.org>
2015-07-21 00:48:11 +01:00
Daira Hopwood
d993e015aa Add checks (that currently fail) for version in local db.
Signed-off-by: Daira Hopwood <daira@jacaranda.org>
2015-07-21 00:48:11 +01:00
Daira Hopwood
afa9d9ae10 Use relative paths in magic folder db.
Signed-off-by: Daira Hopwood <daira@jacaranda.org>
2015-07-21 00:48:11 +01:00
Daira Hopwood
ad4b4843c2 WIP
Signed-off-by: Daira Hopwood <daira@jacaranda.org>
2015-07-21 00:48:11 +01:00
Daira Hopwood
2bd93d2e02 Fix some pyflakes errors and warnings.
Signed-off-by: Daira Hopwood <daira@jacaranda.org>
2015-07-21 00:48:11 +01:00
Daira Hopwood
f423e72062 Repair backupdb.
Signed-off-by: Daira Hopwood <daira@jacaranda.org>
2015-07-21 00:48:11 +01:00
David Stainton
57fc30be44 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
2015-07-21 00:48:11 +01:00
David Stainton
a6b75aaa5d add kw arg to _get_count for tests 2015-07-21 00:48:11 +01:00
David Stainton
16c72decc0 make test_magic_folder use non-ascii chars in nickname 2015-07-21 00:48:11 +01:00
David Stainton
42602ba290 Make alice bob test use non-ascii chars in nicknames 2015-07-21 00:48:11 +01:00
David Stainton
598695010a add comments and blank lines to make setup_alice_and_bob more readable 2015-07-21 00:48:11 +01:00
David Stainton
444c732f81 rename to do_invite and do_join for tests 2015-07-21 00:48:11 +01:00
David Stainton
d57d30c60f rename to do_create_magic_folder for tests 2015-07-21 00:48:11 +01:00
David Stainton
c7e0fc52e3 revert previous additional blank line 2015-07-21 00:48:11 +01:00
David Stainton
12fc5e6161 wrap long import line 2015-07-21 00:48:11 +01:00
David Stainton
3b6f51abdc wrap long line and spell magic folder without hyphen 2015-07-21 00:48:11 +01:00
David Stainton
3612ca0504 Spell magic folder without the hyphen 2015-07-21 00:48:10 +01:00
David Stainton
847e8e99e9 wrap long line 2015-07-21 00:48:10 +01:00