Commit Graph

6260 Commits

Author SHA1 Message Date
David Stainton
f1bb8afd2b Attempt to teach bob to upload a file 2015-10-27 18:44:55 +00:00
David Stainton
c33e918bbf Count conflicted objects 2015-10-27 18:44:55 +00:00
Daira Hopwood
63ad778b7d Basic remote conflict detection based on ancestor uri
Signed-off-by: Daira Hopwood <daira@jacaranda.org>
2015-10-27 18:44:45 +00:00
Daira Hopwood
7a2e021c75 magic-folder.rst: remove "Known Issues and Limitations" that have been fixed.
Signed-off-by: Daira Hopwood <daira@jacaranda.org>
2015-10-27 01:54:54 +00:00
Daira Hopwood
3530e662d6 magic-folder.rst: update introduction.
Signed-off-by: Daira Hopwood <daira@jacaranda.org>
2015-10-27 01:53:50 +00:00
Daira Hopwood
61023bd98a 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>
2015-10-27 01:20:28 +00:00
Daira Hopwood
c4c22767c0 Fix test_alice_bob.
Signed-off-by: Daira Hopwood <daira@jacaranda.org>
2015-10-26 14:24:36 -06:00
Daira Hopwood
7944d2b30a Add counter for uploader.objects_not_uploaded.
Signed-off-by: Daira Hopwood <daira@jacaranda.org>
2015-10-26 14:24:36 -06:00
Daira Hopwood
e8e2038468 Advance Bob's clock after notifying.
Signed-off-by: Daira Hopwood <daira@jacaranda.org>
2015-10-26 14:24:36 -06:00
Daira Hopwood
377c30517e test_alice_bob: use magic= argument to notify, rather than self.magicfolder.
Signed-off-by: Daira Hopwood <daira@jacaranda.org>
2015-10-26 14:24:36 -06:00
meejah
0058044128 add excluded check 2015-10-26 14:24:36 -06:00
meejah
7e8577be06 add the 'spurious' notifies 2015-10-26 14:24:36 -06:00
Daira Hopwood
aa6a22fb89 Fix a pyflakes warning and check existence of file in Bob's local dir.
Signed-off-by: Daira Hopwood <daira@jacaranda.org>
2015-10-26 14:24:36 -06:00
meejah
ab68608345 implement 'delete' functionality, with tests 2015-10-26 14:24:13 -06:00
meejah
716d45dbdd smoketest for magic-folder functionality 2015-10-26 14:20:03 -06:00
Daira Hopwood
5d2365f6c4 Describe use of size=None for deleted files. refs ticket:1710.
Signed-off-by: Daira Hopwood <daira@jacaranda.org>
2015-10-25 13:19:13 +00:00
Daira Hopwood
85bcd89f3a Schema change for last_uploaded_uri.
Signed-off-by: Daira Hopwood <daira@jacaranda.org>
2015-10-25 13:18:11 +00:00
Daira Hopwood
277c996e4a Earth Dragons: take into account that the replaced file may not exist.
Signed-off-by: Daira Hopwood <daira@jacaranda.org>
2015-10-25 13:17:46 +00:00
Daira Hopwood
7d996dbb19 Writing a file without a db entry is an overwrite.
Signed-off-by: Daira Hopwood <daira@jacaranda.org>
2015-10-25 13:13:36 +00:00
Daira Hopwood
a2135600f8 remote-to-local-sync.rst: fix an inconsistency in the representation option table.
Signed-off-by: Daira Hopwood <daira@jacaranda.org>
2015-10-25 11:18:23 +00:00
Daira Hopwood
e067d2d682 Add test that we don't write files outside the magic folder directory. refs ticket:2506
Signed-off-by: Daira Hopwood <daira@jacaranda.org>
2015-10-22 14:30:13 +01:00
Daira Hopwood
35e05fa979 Fix infinite loop in should_ignore_path for absolute paths.
Signed-off-by: Daira Hopwood <daira@jacaranda.org>
2015-10-22 14:28:26 +01:00
Daira Hopwood
ae27bc2b83 More debug logging.
Signed-off-by: Daira Hopwood <daira@jacaranda.org>
2015-10-22 14:27:39 +01:00
Daira Hopwood
98879af6e9 Unicode fix for do_join.
Signed-off-by: Daira Hopwood <daira@jacaranda.org>
2015-10-20 21:50:00 +01:00
Daira Hopwood
f7e02c51b3 Minor cleanups to tests.
Signed-off-by: Daira Hopwood <daira@jacaranda.org>
2015-10-20 21:43:54 +01:00
Daira Hopwood
b5b301707b Ensure that errors from Alice-and-Bob tests are reported correctly if setup fails.
Signed-off-by: Daira Hopwood <daira@jacaranda.org>
2015-10-20 21:37:05 +01:00
Daira Hopwood
fadd2049bb Cosmetics.
Signed-off-by: Daira Hopwood <daira@jacaranda.org>
2015-10-20 21:36:11 +01:00
Daira Hopwood
3d4deca0b2 Eliminate duplicate parsing of invite code.
Signed-off-by: Daira Hopwood <daira@jacaranda.org>
2015-10-20 21:19:04 +01:00
Daira Hopwood
dc77acc424 Remaining test fixes.
Signed-off-by: Daira Hopwood <daira@jacaranda.org>
2015-10-20 17:31:03 +01:00
Daira Hopwood
3eecd1ab2e 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>
2015-10-20 17:30:53 +01:00
Daira Hopwood
1552b7dde0 Cosmetics.
Signed-off-by: Daira Hopwood <daira@jacaranda.org>
2015-10-20 17:27:38 +01:00
Daira Hopwood
db536a3bce URIs are strs.
Signed-off-by: Daira Hopwood <daira@jacaranda.org>
2015-10-20 17:16:32 +01:00
Daira Hopwood
238479305f Aliases and nicknames are Unicode.
Signed-off-by: Daira Hopwood <daira@jacaranda.org>
2015-10-20 17:13:58 +01:00
Daira Hopwood
8c4a9b08ee Add precondition that arguments to do_cli are strs.
Signed-off-by: Daira Hopwood <daira@jacaranda.org>
2015-10-20 15:12:36 +01:00
Daira Hopwood
f1ed5b7136 Fix call to argv_to_abspath. Also rename localdir to local_dir.
Signed-off-by: Daira Hopwood <daira@jacaranda.org>
2015-10-20 14:52:00 +01:00
David Stainton
aa4a3c2da4 Fix magic-folder cli tests
convert path to abs path when matching
strings in the generated config file.
2015-10-20 14:27:05 +02:00
David Stainton
2e587937c1 Attempt to fix cli tests 2015-10-20 13:08:14 +02:00
Daira Hopwood
b032ab829f Better but still broken tests.
Signed-off-by: Daira Hopwood <daira@jacaranda.org>
2015-10-19 18:25:02 +01:00
Daira Hopwood
588002a8b1 Fix check for initial '-' in argv_to_abspath.
Signed-off-by: Daira Hopwood <daira@jacaranda.org>
2015-10-19 18:24:33 +01:00
David Stainton
09871d76c7 Fix tests by submitting unicode args instead of str 2015-10-19 16:14:12 +02:00
David Stainton
ef39ca17ba 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
2015-10-19 16:02:28 +02:00
David Stainton
3367b40990 Use argv_to_abspath for magic-folder join file path arg 2015-10-19 14:14:32 +02:00
Daira Hopwood
fb55baa91b Test creation of a subdirectory.
Signed-off-by: Daira Hopwood <daira@jacaranda.org>
2015-10-16 20:39:39 +01:00
Daira Hopwood
58388bebf1 Watch for IN_CREATE events but filter them out for non-directories.
Signed-off-by: Daira Hopwood <daira@jacaranda.org>
2015-10-16 16:21:50 +01:00
Daira Hopwood
5297f99116 Patch Downloader.REMOTE_SCAN_INTERVAL rather than setting it persistently.
Signed-off-by: Daira Hopwood <daira@jacaranda.org>
2015-10-16 03:27:59 +01:00
Daira Hopwood
07b80cf669 Implement creating local directories in downloader.
Signed-off-by: Daira Hopwood <daira@jacaranda.org>
2015-10-16 03:27:20 +01:00
Daira Hopwood
dad9b11853 Decode names in the scanned remote.
Signed-off-by: Daira Hopwood <daira@jacaranda.org>
2015-10-16 03:25:45 +01:00
Daira Hopwood
8c8d1885ce Refactoring to allow logging from _write_downloaded_file and _rename_conflicted_file.
Signed-off-by: Daira Hopwood <daira@jacaranda.org>
2015-10-16 03:24:46 +01:00
Daira Hopwood
8348913b8a 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>
2015-10-15 23:02:30 +01:00
Daira Hopwood
1d0e2b5cda Logging/debugging improvements.
Signed-off-by: Daira Hopwood <daira@jacaranda.org>
2015-10-15 23:02:07 +01:00