tahoe-lafs/tahoe-lafs.git
9 years agoFix another rebasing error.
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>
9 years agoFix an import that broke during rebasing.
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>
9 years agoRemove or comment out print statements and improve logging.
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>
9 years agoRemove MagicFolderTestMixin._create_magicfolder.
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>
9 years agoRemove MagicFolderCLITestMixin.create_magicfolder.
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>
9 years agoMinor cleanup.
Daira Hopwood [Mon, 14 Sep 2015 19:16:24 +0000 (20:16 +0100)]
Minor cleanup.

Signed-off-by: Daira Hopwood <daira@jacaranda.org>
9 years agoRemove redundant inotify parameters to MagicFolder and Uploader constructors.
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>
9 years agoEnsure that fake_inotify is used for restarted clients in MockTest.
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>
9 years agoCompare size and ctime as well as mtime.
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>
9 years agoFix test bug that accidentally suppressed errors.
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>
9 years agoTeach should_ignore_file to require unicode
David Stainton [Mon, 14 Sep 2015 10:41:12 +0000 (12:41 +0200)]
Teach should_ignore_file to require unicode

9 years agoSimply should_ignore_file helper function
David Stainton [Mon, 14 Sep 2015 04:29:56 +0000 (06:29 +0200)]
Simply should_ignore_file helper function

9 years agoActivate test_alice_bob test
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

9 years agoRemove old debugging print statements
David Stainton [Sun, 13 Sep 2015 10:49:29 +0000 (12:49 +0200)]
Remove old debugging print statements

9 years agoWIP
David Stainton [Sat, 12 Sep 2015 18:27:10 +0000 (20:27 +0200)]
WIP

9 years agoremove debug print statements
David Stainton [Sat, 12 Sep 2015 18:10:45 +0000 (20:10 +0200)]
remove debug print statements

9 years agoFix version incrementation bug
David Stainton [Sat, 12 Sep 2015 18:09:55 +0000 (20:09 +0200)]
Fix version incrementation bug

only increment if mtimes are differing...

9 years agoAdd is_new_file_time db helper function
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

9 years agoFix bug in Downloader's _get_local_latest
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.

9 years agoTeach test_persistence to only use one clientdir
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

9 years agoWIP
David Stainton [Fri, 11 Sep 2015 19:40:15 +0000 (21:40 +0200)]
WIP

9 years agofix unit test helper _wait_until_started by using ready()
David Stainton [Fri, 11 Sep 2015 13:34:19 +0000 (15:34 +0200)]
fix unit test helper _wait_until_started by using ready()

9 years agoTeach test_persistence to upload a 2nd file
David Stainton [Fri, 11 Sep 2015 11:37:01 +0000 (13:37 +0200)]
Teach test_persistence to upload a 2nd file

test fails...

9 years agoTeach test_persistence to restart client with the new no network grid api changes
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

9 years agoAdd should_ignore_file and tests
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.

9 years agoRepair test_replace_file for the case where the replaced file did not already exist
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>
9 years agoRepair test.
Daira Hopwood [Tue, 8 Sep 2015 14:30:00 +0000 (15:30 +0100)]
Repair test.

Signed-off-by: Daira Hopwood <daira@jacaranda.org>
9 years agorestart_client needs to remove the old client from its parent, not just stop it.
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>
9 years agostartService can be called more than once.
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>
9 years agoComment out some print statements.
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>
9 years agoCleanup of _restart_client.
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>
9 years agoFix a logging bug for Unicode nicknames.
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>
9 years agoWIP
Daira Hopwood [Thu, 3 Sep 2015 19:21:54 +0000 (20:21 +0100)]
WIP

Signed-off-by: Daira Hopwood <daira@jacaranda.org>
9 years agoSolve a potential race condition by waiting until the uploader is started.
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>
9 years agoRemove self.client and stats_provider attributes which could get out-of-sync with...
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>
9 years agoAdd 'started' hook to Magic Folder uploader.
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>
9 years agoRemove unused variables.
Daira Hopwood [Thu, 3 Sep 2015 19:16:27 +0000 (20:16 +0100)]
Remove unused variables.

Signed-off-by: Daira Hopwood <daira@jacaranda.org>
9 years agoAdd _restart_client callback.
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>
9 years agostopService does not necessarily return a Deferred.
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>
9 years agoAdd a restart_client method to GridTestMixin.
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>
9 years agoRename test_cli_magic_folder.MagicFolderTestMixin to MagicFolderCLITestMixin.
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>
9 years agoAdd print statements.
Daira Hopwood [Thu, 3 Sep 2015 14:47:20 +0000 (15:47 +0100)]
Add print statements.

Signed-off-by: Daira Hopwood <daira@jacaranda.org>
9 years agoWIP
David Stainton [Wed, 2 Sep 2015 13:10:53 +0000 (15:10 +0200)]
WIP

9 years agoRevert "Attempt to fix test_persistence"
David Stainton [Tue, 1 Sep 2015 12:35:03 +0000 (14:35 +0200)]
Revert "Attempt to fix test_persistence"

This reverts commit 257d6665d29454351886d9c1125d214b21c324f7.

9 years agoAttempt to fix test_persistence
David Stainton [Mon, 31 Aug 2015 21:38:55 +0000 (23:38 +0200)]
Attempt to fix test_persistence

broken WIP, startup path was broken

9 years agoAdd db util function for retrieving all downloaded files
David Stainton [Mon, 31 Aug 2015 21:38:31 +0000 (23:38 +0200)]
Add db util function for retrieving all downloaded files

9 years agoMore precise and correct error reporting in replace_file.
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>
9 years agoFix path handling in Downloader._process.
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>
9 years agoMake _write_downloaded_file return the path of the destination file.
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>
9 years agoreplace_file should not fail if replaced_path does not exist.
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>
9 years agoMove the test for _write_download_file() to test_magic_folder module
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

9 years agoWIP: test for _write_downloaded_file
Ramakrishnan Muthukrishnan [Mon, 31 Aug 2015 07:32:34 +0000 (13:02 +0530)]
WIP: test for _write_downloaded_file

9 years agomore debugging print statements
David Stainton [Sat, 29 Aug 2015 11:29:47 +0000 (13:29 +0200)]
more debugging print statements

9 years agoUncomment alice bob test print statements
David Stainton [Fri, 28 Aug 2015 13:19:51 +0000 (15:19 +0200)]
Uncomment alice bob test print statements

9 years agoRemove stupid errback and raise proper conflict exception
David Stainton [Wed, 26 Aug 2015 20:04:49 +0000 (22:04 +0200)]
Remove stupid errback and raise proper conflict exception

9 years agoFix replace_file; rename only if replaced_path exists
David Stainton [Wed, 26 Aug 2015 20:02:26 +0000 (22:02 +0200)]
Fix replace_file; rename only if replaced_path exists

9 years agoAdd err print statement to show the conflict...
David Stainton [Wed, 26 Aug 2015 15:50:03 +0000 (17:50 +0200)]
Add err print statement to show the conflict...

9 years agoCapture exceptions from conflict and write info in magic folder db
David Stainton [Wed, 26 Aug 2015 14:50:35 +0000 (16:50 +0200)]
Capture exceptions from conflict and write info in magic folder db

9 years agoFix _write_downloaded_file by adding base path
David Stainton [Wed, 26 Aug 2015 13:28:44 +0000 (15:28 +0200)]
Fix _write_downloaded_file by adding base path

9 years agoCorrect spelling is os.utime not utimes
David Stainton [Wed, 26 Aug 2015 12:40:08 +0000 (14:40 +0200)]
Correct spelling is os.utime not utimes

9 years agoAdd Downloader._write_downloaded_file. refs ticket:2489
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>
9 years agoRemove debug prints in backupdb.py.
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>
9 years agoRemove or comment out print statements.
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>
9 years agoRename Client.upload_ready_d to connected_enough_d.
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>
9 years agoIn Downloader._get_collective_latest_file, consume errors when getting metadata.
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>
9 years agoTeach uploader to process lazy tail upon stop method
David Stainton [Mon, 24 Aug 2015 11:19:45 +0000 (13:19 +0200)]
Teach uploader to process lazy tail upon stop method

9 years agoTeach magic-folder ready method to return a deferred
David Stainton [Mon, 24 Aug 2015 11:11:37 +0000 (13:11 +0200)]
Teach magic-folder ready method to return a deferred

9 years agoFix a bug in Downloader._scan_remote that incorrectly skips subsequent files
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>
9 years agoUse deferredutil.HookMixin to simplify callback for tests.
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>
9 years agoMinor fix to alice bob test
David Stainton [Wed, 19 Aug 2015 19:56:29 +0000 (21:56 +0200)]
Minor fix to alice bob test

9 years agoFix _scan_remote and remove print statements
David Stainton [Wed, 19 Aug 2015 19:45:20 +0000 (21:45 +0200)]
Fix _scan_remote and remove print statements

9 years agoFix incorrect order of fields in SQL statement.
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>
9 years agoCleanup.
Daira Hopwood [Wed, 19 Aug 2015 14:33:08 +0000 (15:33 +0100)]
Cleanup.

Signed-off-by: Daira Hopwood <daira@jacaranda.org>
9 years agoMore debug prints.
Daira Hopwood [Wed, 19 Aug 2015 14:32:52 +0000 (15:32 +0100)]
More debug prints.

Signed-off-by: Daira Hopwood <daira@jacaranda.org>
9 years agoDebug prints to diagnose version mismatch after deletion (backupdb).
Daira Hopwood [Wed, 19 Aug 2015 13:48:11 +0000 (13:48 +0000)]
Debug prints to diagnose version mismatch after deletion (backupdb).

9 years agoDebug prints to diagnose version mismatch after deletion.
Daira Hopwood [Wed, 19 Aug 2015 13:31:38 +0000 (13:31 +0000)]
Debug prints to diagnose version mismatch after deletion.

9 years agoAdd some print statements.
David Stainton [Tue, 18 Aug 2015 14:33:29 +0000 (14:33 +0000)]
Add some print statements.

9 years agotest_get_pathinfo: testdir is unnecessary
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.

9 years agotest_get_pathinfo: rename the identifier d to testdir
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.

9 years agoadd more tests for get_pathinfo()
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.

9 years agoAdd test for get_pathinfo()
Ramakrishnan Muthukrishnan [Wed, 12 Aug 2015 08:43:13 +0000 (14:13 +0530)]
Add test for get_pathinfo()

9 years agoUse get_pathinfo instead of separate os.path.{is*,exists} calls.
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>
9 years agoExtend get_pathinfo to add size, ctime and mtime.
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>
9 years agoRemove an unnecessary precondition and an incorrect comment.
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>
9 years agoAdd fileutil.get_pathinfo function.
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>
9 years agoExtract get_metadata and get_filenode to methods of Uploader.
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>
9 years agoProcessing symlinks and special files should not be an error.
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>
9 years agoRefactor uploader by inlining _add_file into _process._maybe_upload.
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>
9 years agoRefactor uploader by inlining _add_file into _process._maybe_upload.
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>
9 years agoRefactor uploader by extracting _process_child to a top-level method.
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>
9 years agoSwap two checks to clarify which is failing.
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>
9 years agofix code that adds version number of deleted file to magic-folder db
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

9 years agoenable version checking tests - currently a righteous fail
David Stainton [Fri, 31 Jul 2015 22:08:35 +0000 (15:08 -0700)]
enable version checking tests - currently a righteous fail

9 years agomake various changes - work in progress
David Stainton [Fri, 31 Jul 2015 22:06:12 +0000 (15:06 -0700)]
make various changes - work in progress

9 years agoadd version checking to alice bob test
David Stainton [Fri, 31 Jul 2015 18:09:30 +0000 (11:09 -0700)]
add version checking to alice bob test

9 years agoUpdate magic-folder db after download
David Stainton [Fri, 31 Jul 2015 17:51:19 +0000 (10:51 -0700)]
Update magic-folder db after download

9 years agoAdd final download to alice bob test
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

9 years agoRemove old unused append to deque function from downloader
David Stainton [Thu, 30 Jul 2015 20:57:29 +0000 (13:57 -0700)]
Remove old unused append to deque function from downloader

9 years agoWIP to unify queue processing between uploader and 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>
9 years agoRepair tests.
Daira Hopwood [Thu, 30 Jul 2015 17:12:50 +0000 (18:12 +0100)]
Repair tests.

Signed-off-by: Daira Hopwood <daira@jacaranda.org>