tahoe-lafs/tahoe-lafs.git
8 years agoFix test_errors.
Daira Hopwood [Mon, 2 Nov 2015 22:12:09 +0000 (22:12 +0000)]
Fix test_errors.

Signed-off-by: Daira Hopwood <daira@jacaranda.org>
8 years agoFix test_move_tree.
Daira Hopwood [Mon, 2 Nov 2015 22:11:30 +0000 (22:11 +0000)]
Fix test_move_tree.

Signed-off-by: Daira Hopwood <daira@jacaranda.org>
8 years agoDebugging WIP.
Daira Hopwood [Mon, 2 Nov 2015 22:10:55 +0000 (22:10 +0000)]
Debugging WIP.

Signed-off-by: Daira Hopwood <daira@jacaranda.org>
8 years agoFix a corner case for to_filepath on Windows to make it consistent with Unix.
Daira Hopwood [Mon, 2 Nov 2015 22:00:31 +0000 (22:00 +0000)]
Fix a corner case for to_filepath on Windows to make it consistent with Unix.

Signed-off-by: Daira Hopwood <daira@jacaranda.org>
8 years agotest_encodingutil: add tests for FilePath-related functions.
Daira Hopwood [Mon, 2 Nov 2015 21:43:41 +0000 (21:43 +0000)]
test_encodingutil: add tests for FilePath-related functions.

Signed-off-by: Daira Hopwood <daira@jacaranda.org>
8 years agotest_encodingutil: use self.patch rather than modifying encodingutil.io_encoding...
Daira Hopwood [Mon, 2 Nov 2015 21:42:42 +0000 (21:42 +0000)]
test_encodingutil: use self.patch rather than modifying encodingutil.io_encoding directly.

Signed-off-by: Daira Hopwood <daira@jacaranda.org>
8 years agoDepend on FilePath.asTextMode().
Daira Hopwood [Mon, 2 Nov 2015 21:41:10 +0000 (21:41 +0000)]
Depend on FilePath.asTextMode().

Signed-off-by: Daira Hopwood <daira@jacaranda.org>
8 years agoWIP: exclude own dirnode from scan. This is not quite right; we shouldn't exclude...
Daira Hopwood [Mon, 2 Nov 2015 15:16:21 +0000 (15:16 +0000)]
WIP: exclude own dirnode from scan. This is not quite right; we shouldn't exclude it on startup. refs #2553

Signed-off-by: Daira Hopwood <daira@jacaranda.org>
8 years agoMagic Folder docs: status of tests on Windows.
Daira Hopwood [Mon, 2 Nov 2015 17:15:36 +0000 (17:15 +0000)]
Magic Folder docs: status of tests on Windows.

Signed-off-by: Daira Hopwood <daira@jacaranda.org>
8 years agoMore Magic Folder doc updates.
Daira Hopwood [Mon, 2 Nov 2015 14:24:24 +0000 (14:24 +0000)]
More Magic Folder doc updates.

Signed-off-by: Daira Hopwood <daira@jacaranda.org>
8 years agoMagic Folder doc updates.
Daira Hopwood [Mon, 2 Nov 2015 14:14:49 +0000 (14:14 +0000)]
Magic Folder doc updates.

Signed-off-by: Daira Hopwood <daira@jacaranda.org>
8 years agoDon't add subdirectory watches if the platform's notifier doesn't require them. refs...
Daira Hopwood [Fri, 30 Oct 2015 02:04:30 +0000 (02:04 +0000)]
Don't add subdirectory watches if the platform's notifier doesn't require them. refs #2559

Signed-off-by: Daira Hopwood <daira@jacaranda.org>
8 years agoImprove reporting of assertion failures.
Daira Hopwood [Fri, 30 Oct 2015 02:03:26 +0000 (02:03 +0000)]
Improve reporting of assertion failures.

Signed-off-by: Daira Hopwood <daira@jacaranda.org>
8 years agoFix unused import.
Daira Hopwood [Thu, 29 Oct 2015 21:12:14 +0000 (21:12 +0000)]
Fix unused import.

Signed-off-by: Daira Hopwood <daira@jacaranda.org>
8 years agofix the windows command-line too
meejah [Wed, 28 Oct 2015 20:45:50 +0000 (14:45 -0600)]
fix the windows command-line too

8 years agosome minor fixes for instructions
meejah [Wed, 28 Oct 2015 20:41:15 +0000 (14:41 -0600)]
some minor fixes for instructions

8 years agoWindows path fix.
Daira Hopwood [Wed, 28 Oct 2015 17:00:57 +0000 (17:00 +0000)]
Windows path fix.

Signed-off-by: Daira Hopwood <daira@jacaranda.org>
8 years agomagic-folder-howto.rst formatting fixes.
Daira Hopwood [Wed, 28 Oct 2015 16:58:49 +0000 (16:58 +0000)]
magic-folder-howto.rst formatting fixes.

Signed-off-by: Daira Hopwood <daira@jacaranda.org>
8 years agoAdd docs/magic-folder-howto.rst.
Daira Hopwood [Wed, 28 Oct 2015 16:54:37 +0000 (16:54 +0000)]
Add docs/magic-folder-howto.rst.

Signed-off-by: Daira Hopwood <daira@jacaranda.org>
8 years agoAdd test for 'tahoe create-node/client/introducer' output. closes ticket:2556
Daira Hopwood [Wed, 28 Oct 2015 13:49:43 +0000 (13:49 +0000)]
Add test for 'tahoe create-node/client/introducer' output. closes ticket:2556

Signed-off-by: Daira Hopwood <daira@jacaranda.org>
8 years agobin\tahoe can't be run directly on Windows.
Daira Hopwood [Wed, 28 Oct 2015 00:33:59 +0000 (00:33 +0000)]
bin\tahoe can't be run directly on Windows.

Signed-off-by: Daira Hopwood <daira@jacaranda.org>
8 years agoStrip any long path marker in the input to flush_volume.
Daira Hopwood [Tue, 27 Oct 2015 21:39:05 +0000 (21:39 +0000)]
Strip any long path marker in the input to flush_volume.

Signed-off-by: Daira Hopwood <daira@jacaranda.org>
8 years agoCorrect type for Windows BOOL.
Daira Hopwood [Tue, 27 Oct 2015 21:38:03 +0000 (21:38 +0000)]
Correct type for Windows BOOL.

Signed-off-by: Daira Hopwood <daira@jacaranda.org>
8 years agoDepend on Twisted >= 15.2.0 and (finally!) retire the setup_requires hack.
Daira Hopwood [Tue, 27 Oct 2015 20:55:14 +0000 (20:55 +0000)]
Depend on Twisted >= 15.2.0 and (finally!) retire the setup_requires hack.

Signed-off-by: Daira Hopwood <daira@jacaranda.org>
8 years agoDisable precondition that autoAdd == recursive.
Daira Hopwood [Tue, 27 Oct 2015 20:36:04 +0000 (20:36 +0000)]
Disable precondition that autoAdd == recursive.

Signed-off-by: Daira Hopwood <daira@jacaranda.org>
8 years agoFix a type error.
Daira Hopwood [Tue, 27 Oct 2015 20:35:41 +0000 (20:35 +0000)]
Fix a type error.

Signed-off-by: Daira Hopwood <daira@jacaranda.org>
8 years agoFlush handling WIP.
Daira Hopwood [Tue, 27 Oct 2015 20:07:41 +0000 (20:07 +0000)]
Flush handling WIP.

Signed-off-by: Daira Hopwood <daira@jacaranda.org>
8 years agoUse fileutil.write for magic folder tests.
Daira Hopwood [Tue, 27 Oct 2015 13:56:32 +0000 (13:56 +0000)]
Use fileutil.write for magic folder tests.

Signed-off-by: Daira Hopwood <daira@jacaranda.org>
8 years agoImprove all of the Windows-specific error reporting.
Daira Hopwood [Tue, 27 Oct 2015 14:47:11 +0000 (14:47 +0000)]
Improve all of the Windows-specific error reporting.
Also make the Windows function declarations more readable and consistent.

Signed-off-by: Daira Hopwood <daira@jacaranda.org>
8 years agoConsolidate Windows-specific imports in fileutil to avoid pyflakes warnings.
Daira Hopwood [Tue, 27 Oct 2015 12:02:57 +0000 (12:02 +0000)]
Consolidate Windows-specific imports in fileutil to avoid pyflakes warnings.

Signed-off-by: Daira Hopwood <daira@jacaranda.org>
8 years agoreplace_file should allow the replaced file not to exist on Windows.
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>
8 years agoFix fileutil tests.
Daira Hopwood [Sat, 24 Oct 2015 00:14:18 +0000 (01:14 +0100)]
Fix fileutil tests.

Signed-off-by: Daira Hopwood <daira@jacaranda.org>
8 years agoMore path fixes.
Daira Hopwood [Fri, 23 Oct 2015 22:13:43 +0000 (23:13 +0100)]
More path fixes.

Signed-off-by: Daira Hopwood <daira@jacaranda.org>
8 years agoFix a test broken by the last commit.
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>
8 years agoDon't include [magic_folder]enabled and local.directory fields by default.
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>
8 years agoDon't use a long path for the [magic_folder]local.directory field.
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>
8 years agoFix some path Unixisms.
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>
8 years agoAdd long_path=False option to abspath_expanduser_unicode.
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>
8 years agoFix test_alice_bob.
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>
8 years agoRefactor _check_up/downloader_count.
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>
8 years agoDon't download the deletion marker file unnecessarily.
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>
8 years agoDistinguish deletion of directories.
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>
8 years agoRename deleted files to .backup rather than unlinking them.
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>
8 years agoAdd file conflict unit test
David Stainton [Tue, 27 Oct 2015 09:59:29 +0000 (10:59 +0100)]
Add file conflict unit test

8 years agoAdd basic bob upload test and fix conflict detect
David Stainton [Tue, 27 Oct 2015 08:44:01 +0000 (09:44 +0100)]
Add basic bob upload test and fix conflict detect

8 years agoFix bob's uploading test...
David Stainton [Tue, 27 Oct 2015 08:18:50 +0000 (09:18 +0100)]
Fix bob's uploading test...

8 years agoAttempt to teach bob to upload a file
David Stainton [Mon, 26 Oct 2015 23:17:47 +0000 (00:17 +0100)]
Attempt to teach bob to upload a file

8 years agoCount conflicted objects
David Stainton [Mon, 26 Oct 2015 20:59:56 +0000 (21:59 +0100)]
Count conflicted objects

8 years agoBasic remote conflict detection based on ancestor uri
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>
8 years agomagic-folder.rst: remove "Known Issues and Limitations" that have been fixed.
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>
8 years agomagic-folder.rst: update introduction.
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>
8 years agoAvoid .format, since it is inconsistent between Python 2.6 and 2.7 (and the rest...
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>
8 years agoFix test_alice_bob.
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>
8 years agoAdd counter for uploader.objects_not_uploaded.
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>
8 years agoAdvance Bob's clock after notifying.
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>
8 years agotest_alice_bob: use magic= argument to notify, rather than self.magicfolder.
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>
8 years agoadd excluded check
meejah [Mon, 26 Oct 2015 18:01:03 +0000 (12:01 -0600)]
add excluded check

8 years agoadd the 'spurious' notifies
meejah [Mon, 26 Oct 2015 17:25:56 +0000 (11:25 -0600)]
add the 'spurious' notifies

8 years agoFix a pyflakes warning and check existence of file in Bob's local dir.
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>
8 years agoimplement 'delete' functionality, with tests
meejah [Thu, 8 Oct 2015 19:00:25 +0000 (13:00 -0600)]
implement 'delete' functionality, with tests

8 years agosmoketest for magic-folder functionality
meejah [Thu, 8 Oct 2015 18:51:21 +0000 (12:51 -0600)]
smoketest for magic-folder functionality

8 years agoDescribe use of size=None for deleted files. refs ticket:1710.
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>
8 years agoSchema change for last_uploaded_uri.
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>
8 years agoEarth Dragons: take into account that the replaced file may not exist.
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>
8 years agoWriting a file without a db entry is an overwrite.
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>
8 years agoremote-to-local-sync.rst: fix an inconsistency in the representation option table.
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>
8 years agoAdd test that we don't write files outside the magic folder directory. refs ticket...
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>
8 years agoFix infinite loop in should_ignore_path for absolute paths.
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>
8 years agoMore debug logging.
Daira Hopwood [Thu, 22 Oct 2015 13:27:39 +0000 (14:27 +0100)]
More debug logging.

Signed-off-by: Daira Hopwood <daira@jacaranda.org>
8 years agoUnicode fix for do_join.
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>
8 years agoMinor cleanups to tests.
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>
8 years agoEnsure that errors from Alice-and-Bob tests are reported correctly if setup fails.
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>
8 years agoCosmetics.
Daira Hopwood [Tue, 20 Oct 2015 20:36:11 +0000 (21:36 +0100)]
Cosmetics.

Signed-off-by: Daira Hopwood <daira@jacaranda.org>
8 years agoEliminate duplicate parsing of invite code.
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>
8 years agoRemaining test fixes.
Daira Hopwood [Tue, 20 Oct 2015 16:31:03 +0000 (17:31 +0100)]
Remaining test fixes.

Signed-off-by: Daira Hopwood <daira@jacaranda.org>
8 years agoMake sure that do_cli is only called with strs, and avoid unnecessary use of attribut...
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>
8 years agoCosmetics.
Daira Hopwood [Tue, 20 Oct 2015 16:27:38 +0000 (17:27 +0100)]
Cosmetics.

Signed-off-by: Daira Hopwood <daira@jacaranda.org>
8 years agoURIs are strs.
Daira Hopwood [Tue, 20 Oct 2015 16:16:32 +0000 (17:16 +0100)]
URIs are strs.

Signed-off-by: Daira Hopwood <daira@jacaranda.org>
8 years agoAliases and nicknames are Unicode.
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>
8 years agoAdd precondition that arguments to do_cli are strs.
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>
8 years agoFix call to argv_to_abspath. Also rename localdir to local_dir.
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>
8 years agoFix magic-folder cli tests
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.

8 years agoAttempt to fix cli tests
David Stainton [Tue, 20 Oct 2015 11:08:14 +0000 (13:08 +0200)]
Attempt to fix cli tests

8 years agoBetter but still broken 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>
8 years agoFix check for initial '-' in argv_to_abspath.
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>
8 years agoFix tests by submitting unicode args instead of str
David Stainton [Mon, 19 Oct 2015 14:14:12 +0000 (16:14 +0200)]
Fix tests by submitting unicode args instead of str

8 years agoTeach magic-folder join to use argv_to_abspath
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

8 years agoUse argv_to_abspath for magic-folder join file path arg
David Stainton [Mon, 19 Oct 2015 12:14:32 +0000 (14:14 +0200)]
Use argv_to_abspath for magic-folder join file path arg

8 years agoTest creation of a subdirectory.
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>
8 years agoWatch for IN_CREATE events but filter them out for non-directories.
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>
8 years agoPatch Downloader.REMOTE_SCAN_INTERVAL rather than setting it persistently.
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>
8 years agoImplement creating local directories in downloader.
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>
8 years agoDecode names in the scanned remote.
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>
8 years agoRefactoring to allow logging from _write_downloaded_file and _rename_conflicted_file.
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>
8 years agoSimplify and fix non-existent-file handling.
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>
8 years agoLogging/debugging improvements.
Daira Hopwood [Thu, 15 Oct 2015 22:02:07 +0000 (23:02 +0100)]
Logging/debugging improvements.

Signed-off-by: Daira Hopwood <daira@jacaranda.org>
8 years agoRefactor and fix race conditions in test_alice_bob.
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>
8 years agoCorrect a call to did_upload_version in the downloader.
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>
8 years agoMake sure that test_move_tree waits until files have been uploaded as well as downloaded.
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>
8 years agoRestore a call to increment files_uploaded that was mistakenly removed.
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>