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

Fix indentation

Fix declaration of is_conflict

import ConflictError

Replace nested if with an 'and' in the if condition...

Move declaration of is_conflict to a smaller scope

Only compare dmd_last_downloaded_uri if it's not None

fix format string

Add get conflicted filename helper function

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

Describe use of size=None for deleted files. refs ticket:1710.

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

Schema change for last_uploaded_uri.

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

Earth Dragons: take into account that the replaced file may not exist.

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

Writing a file without a db entry is an overwrite.

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

remote-to-local-sync.rst: fix an inconsistency in the representation option table.

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

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>

Add precondition that arguments to do_cli are strs.

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)

Merge pull request #193 from meejah/2438.magic-folder-stable.3

Fix call to ready()

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>

.travis.yml: pin coverage version to 3.7.1. fixes ticket:2511

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

Merge branch '2510-new-foolscap'

introweb: fix connection hints for server announcements

A long time ago, the introducer's status web page would show the
advertised IP addresses for all published services, by parsing their
FURL's connection hints. This hasn't worked since about 12-Aug-2014 when
foolscap-0.6.5 changed the internal format of these hints (the column
has been empty this whole time).

This removes the "Advertised IPs" column from the Service Announcements
table. Instead, the service's full connection hints (not just the IP
address) is displayed in a tooltip/popup on the "Announced" timestamp
column.

The code that pulls these connection hints is now tolerant of all three
foolscap styles:

* foolscap<=0.6.4 : tuples of ("ipv4",host,port)
* 0.6.5 .. 0.8.0  : tuples of ("tcp",host,port)
* foolscap>=0.9.0 : strings

fixes ticket:2510

remove "announcement_distinct_hosts" from introweb JSON

The machine-parseable JSON output for the introducer status web page
used to include a key named "announcement_distinct_hosts", which counted
the number of distinct IP addresses advertised by all connected storage
servers. This hasn't worked since Aug-2014 when foolscap-0.6.5 change
the internal hints format.

This removes that field.

introducer: stop tracking hints for subscribed clients

A long time ago, the introducer's status web page would show the
advertised IP addresses for all subscribers, by parsing their
RemoteReference's FURL's connection hints. This hasn't worked since
about 12-Aug-2014 when foolscap-0.6.5 changed the internal format of
these hints.

This removes the feature: we no longer attempt to show advertised IP
addresses of subscribed clients. It also removes the code that looked
inside foolscap internals for this information.

travis: use 'git fetch' to deepen, not 'git pull'

Travis builds of branches (i.e. pull-requests) were testing the wrong
thing, because the 'git pull' was causing current trunk to be
auto-merged. At least that's what seemed to break
https://travis-ci.org/tahoe-lafs/tahoe-lafs/jobs/81517826 : it hung
forever waiting for a commit message to be entered.

Also add "sudo: false" to use travis containers (faster) instead of new
VMs. We only use pip to install dependencies, not apt, so we don't need
root.

Avoid spurious errors when an imported version is consistent with pkg_resources
but not parseable; also improve related error reporting. fixes ticket:2499

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

Merge pull request #187 from tahoe-lafs/2493.cleanup-osx-packaging.1

2493.cleanup osx packaging.1