Add file conflict unit test

Add basic bob upload test and fix conflict detect

Fix bob's uploading test...

Attempt to teach bob to upload a file

Count conflicted objects

Basic remote conflict detection based on ancestor uri

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

magic-folder.rst: remove "Known Issues and Limitations" that have been fixed.

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

magic-folder.rst: update introduction.

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

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>

Fix test_alice_bob.

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

Add counter for uploader.objects_not_uploaded.

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

Advance Bob's clock after notifying.

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

test_alice_bob: use magic= argument to notify, rather than self.magicfolder.

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

add excluded check

add the 'spurious' notifies

Fix a pyflakes warning and check existence of file in Bob's local dir.

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

implement 'delete' functionality, with tests

smoketest for magic-folder functionality

Add test that we don't write files outside the magic folder directory. refs ticket:2506

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

Fix infinite loop in should_ignore_path for absolute paths.

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

More debug logging.

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

Unicode fix for do_join.

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

Minor cleanups to tests.

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

Ensure that errors from Alice-and-Bob tests are reported correctly if setup fails.

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

Cosmetics.

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

Eliminate duplicate parsing of invite code.

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

Remaining test fixes.

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

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>

Cosmetics.

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

URIs are strs.

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

Aliases and nicknames are Unicode.

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

Fix call to argv_to_abspath. Also rename localdir to local_dir.

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

Fix magic-folder cli tests

convert path to abs path when matching
strings in the generated config file.

Attempt to fix cli tests

Better but still broken tests.

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

Fix check for initial '-' in argv_to_abspath.

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

Fix tests by submitting unicode args instead of str

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

Use argv_to_abspath for magic-folder join file path arg

Test creation of a subdirectory.

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

Watch for IN_CREATE events but filter them out for non-directories.

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

Patch Downloader.REMOTE_SCAN_INTERVAL rather than setting it persistently.

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

Implement creating local directories in downloader.

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

Decode names in the scanned remote.

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

Refactoring to allow logging from _write_downloaded_file and _rename_conflicted_file.

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

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>

Logging/debugging improvements.

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

Refactor and fix race conditions in test_alice_bob.

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

Correct a call to did_upload_version in the downloader.

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

Make sure that test_move_tree waits until files have been uploaded as well as downloaded.

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

Restore a call to increment files_uploaded that was mistakenly removed.

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

Teach uploader+downloader to use to db schema

here we attempt to fix all the unit tests as well...
however two tests still fail

Add magicfolderdb.py.

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

Remove magic-folder db code from backupdb.py

WIP

Include brief summary of magic-folder CLI commands

Add link to our cli design doc

Mention gc is not part of the otf grant and link to the gc ticket

Remove old obsolete/inaccurate statements

Minor comment correction for get_all_relpaths

For all downloaded files ensure parent dir exists

Simplify the cleanup_Alice_and_Bob callback.

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

Make downloader delay a class-variable

This gives the integration-style CLI-based tests a chance
to set the delay to 0 before the first 3-second delayed
call is queued to _lazy_tail in the Downloader

Teach unit-tests to time-warp

1. Split alice/bob clocks to avoid races conditions
   in the tests
2. Wrap ._notify so we can advance the clock after inotify
   calls in the RealTest (since it takes >0ms to do the "real" notifies)

Fix call to ready()

Correct a string-type error.

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

WIP.

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

Magic Folder file moves.

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

Prepare to move drop_upload.py to magic_folder.py.

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

Move backupdb.py to src/allmydata.

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

Rename upload_ready_d to connected_enough_d.

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

Documentation changes for Magic Folder.

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

Teach StorageFarmBroker to fire a deferred when a connection threshold is reached. refs #1449

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

Enable Windows inotify support.

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

New code for Windows drop-upload support. refs #1431

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

Docs for drop-upload on Windows.

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

Add magic folder db.

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

Unicode path fixes for drop-upload.

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

wui: improved columns in welcome page server list

As discussed at https://tahoe-lafs.org/trac/tahoe-lafs/ticket/1973 and in
previous pull request #129.

 - replace lengthy timestamps with human-readable deltas (eg 1h 2m 3s)
 - replace "announced" column with "Last RX" column
 - remove service column (it always said the same thing, "storage")
 - fix colspan on 'You are not presently connected' message

Previous versions, some with github comments: https://github.com/leif/tahoe-lafs/commit/3fe9053134b2429904f673df561e602a50f83c7e , https://github.com/leif/tahoe-lafs/commit/486dbfc7bd3c0bbba42a6df8e4564601120aec0e , and https://github.com/tahoe-lafs/tahoe-lafs/commit/c89ea625803be36a18bce1af4eef95dcd78bba2b, https://github.com/tahoe-lafs/tahoe-lafs/commit/9fabb924867e164e1c6d4d805761db6c39652cf7, https://github.com/tahoe-lafs/tahoe-lafs/commit/bbd8b42a25f8617c43b8293f3b654b3d060e27b9

Unlike previous attempts, the tests on this one should pass in any timezone.
(But like current master, will fail with Nevow >=0.12...)

Thanks to an anonymous contributor who wrote some of the tests.

revert previous commit to fix attribution (vanity)

This reverts the previous commit (modulo the one line that daira added) so that
my contributions will be properly attributed by git blame etc.

wui: improved columns in welcome page server list

As discussed at https://tahoe-lafs.org/trac/tahoe-lafs/ticket/1973 and in
previous pull request #129.

 - replace lengthy timestamps with human-readable deltas (eg 1h 2m 3s)
 - replace "announced" column with "Last RX" column
 - remove service column (it always said the same thing, "storage")
 - fix colspan on 'You are not presently connected' message

Previous versions, some with github comments: https://github.com/leif/tahoe-lafs/commit/3fe9053134b2429904f673df561e602a50f83c7e , https://github.com/leif/tahoe-lafs/commit/486dbfc7bd3c0bbba42a6df8e4564601120aec0e , and https://github.com/tahoe-lafs/tahoe-lafs/commit/c89ea625803be36a18bce1af4eef95dcd78bba2b, https://github.com/tahoe-lafs/tahoe-lafs/commit/9fabb924867e164e1c6d4d805761db6c39652cf7, https://github.com/tahoe-lafs/tahoe-lafs/commit/bbd8b42a25f8617c43b8293f3b654b3d060e27b9

Unlike previous attempts, the tests on this one should pass in any timezone.
(But like current master, will fail with Nevow >=0.12...)

Thanks to an anonymous contributor who wrote some of the tests.

wui: use standard time format (#1077)

Merge pull request #220 from tahoe-lafs/2669.magic-folder-misc-patches.1

This PR is a bunch of miscellaneous patches that are on the Magic Folder branches, but independent of Magic Folder itself.

Reject path arguments that start with '-' with a usage error.

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

Improved error handling and cosmetics for ctypes calls on Windows.

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

Find the node-directory option correctly even if we are in a subcommand.

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

test_encodingutil: use self.patch rather than modifying encodingutil.io_encoding directly.

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

Require arguments to do_cli to be strs.

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

URIs are strs.

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

Aliases are Unicode.

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

Corrections and clarifications to remote-to-local-sync.rst.

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

Refactor tahoe.cfg handling to configutil.

Author: David Stainton <david@leastauthority.com>
Signed-off-by: Daira Hopwood <daira@jacaranda.org>

Merge pull request #204 from leif/preferred_peers-rebased3

new feature: preferred storage servers

Merge pull request #206 from leif/python27

drop Python 2.6 (.travis.yml, doc, setup.py)

drop Python 2.6 (.travis.yml, doc, setup.py)

Twisted 15 dropped support for it, which causes Travis CI tests to fail on 2.6.
We still theoretically support older versions of Twisted, so perhaps we should
configure Travis to test with those? I think we should drop Python 2.6 in any
case since distros are all on 2.7 now.

I'm leaving Travis running (and ignoring) the failing PyPy tests because I
don't know why that is there.

new feature: preferred storage servers

this includes a squash merge of dca1de6856d0bacb0d57cedcf1a81896910f4efd which
was previously seen in pull request #128, as well as daira's suggested changes
from pull request #204.

Merge pull request #203 from tahoe-lafs/2556.quote-paths-in-node-creation.0

2556.quote-paths-in-node-creation.0

Add test for 'tahoe create-node/client/introducer' output. closes ticket:2556

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

Quote local paths correctly in the output of node creation commands. fixes ticket:2556

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

Merge pull request #202 from tahoe-lafs/2567.turn-off-log-bridging.0

Disable bridging of foolscap logging to the Twisted log...