Daira Hopwood
|
dacf6ef633
|
More path fixes.
Signed-off-by: Daira Hopwood <daira@jacaranda.org>
|
2016-07-21 12:35:59 -07:00 |
|
Daira Hopwood
|
f12ac3d94e
|
Fix a test broken by the last commit.
Signed-off-by: Daira Hopwood <daira@jacaranda.org>
|
2016-07-21 12:35:59 -07:00 |
|
Daira Hopwood
|
a622109a87
|
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>
|
2016-07-21 12:35:59 -07:00 |
|
Daira Hopwood
|
6fb7f86855
|
Don't use a long path for the [magic_folder]local.directory field.
Signed-off-by: Daira Hopwood <daira@jacaranda.org>
|
2016-07-21 12:35:59 -07:00 |
|
Daira Hopwood
|
2a79252a72
|
Fix some path Unixisms.
Signed-off-by: Daira Hopwood <daira@jacaranda.org>
|
2016-07-21 12:35:59 -07:00 |
|
Daira Hopwood
|
45adc30ed6
|
Fix test_alice_bob.
Signed-off-by: Daira Hopwood <daira@jacaranda.org>
|
2016-07-21 12:35:59 -07:00 |
|
Daira Hopwood
|
e591c3aa81
|
Refactor _check_up/downloader_count.
Signed-off-by: Daira Hopwood <daira@jacaranda.org>
|
2016-07-21 12:35:59 -07:00 |
|
Daira Hopwood
|
1abc2c39c8
|
Don't download the deletion marker file unnecessarily.
Signed-off-by: Daira Hopwood <daira@jacaranda.org>
|
2016-07-21 12:35:59 -07:00 |
|
Daira Hopwood
|
c6191257ea
|
Distinguish deletion of directories.
Signed-off-by: Daira Hopwood <daira@jacaranda.org>
|
2016-07-21 12:35:59 -07:00 |
|
Daira Hopwood
|
d6bb49b1a6
|
Rename deleted files to .backup rather than unlinking them.
Signed-off-by: Daira Hopwood <daira@jacaranda.org>
|
2016-07-21 12:35:59 -07:00 |
|
David Stainton
|
a043a31860
|
Add file conflict unit test
|
2016-07-21 12:35:59 -07:00 |
|
David Stainton
|
99d1339d38
|
Add basic bob upload test and fix conflict detect
|
2016-07-21 12:35:59 -07:00 |
|
David Stainton
|
ee3d9b19be
|
Fix bob's uploading test...
|
2016-07-21 12:35:59 -07:00 |
|
David Stainton
|
890e4622b9
|
Attempt to teach bob to upload a file
|
2016-07-21 12:35:59 -07:00 |
|
David Stainton
|
9ed61f1eb4
|
Count conflicted objects
|
2016-07-21 12:35:59 -07:00 |
|
Daira Hopwood
|
7a3b35e29c
|
Basic remote conflict detection based on ancestor uri
Signed-off-by: Daira Hopwood <daira@jacaranda.org>
|
2016-07-21 12:35:59 -07:00 |
|
Daira Hopwood
|
815a50df71
|
magic-folder.rst: remove "Known Issues and Limitations" that have been fixed.
Signed-off-by: Daira Hopwood <daira@jacaranda.org>
|
2016-07-21 12:35:59 -07:00 |
|
Daira Hopwood
|
2f6ca5d3da
|
magic-folder.rst: update introduction.
Signed-off-by: Daira Hopwood <daira@jacaranda.org>
|
2016-07-21 12:35:59 -07:00 |
|
Daira Hopwood
|
f75dda7635
|
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>
|
2016-07-21 12:35:59 -07:00 |
|
Daira Hopwood
|
5a2b2e61c7
|
Fix test_alice_bob.
Signed-off-by: Daira Hopwood <daira@jacaranda.org>
|
2016-07-21 12:35:59 -07:00 |
|
Daira Hopwood
|
e4082a45d3
|
Add counter for uploader.objects_not_uploaded.
Signed-off-by: Daira Hopwood <daira@jacaranda.org>
|
2016-07-21 12:35:59 -07:00 |
|
Daira Hopwood
|
95e2961a2e
|
Advance Bob's clock after notifying.
Signed-off-by: Daira Hopwood <daira@jacaranda.org>
|
2016-07-21 12:35:59 -07:00 |
|
Daira Hopwood
|
6e5e8ddd80
|
test_alice_bob: use magic= argument to notify, rather than self.magicfolder.
Signed-off-by: Daira Hopwood <daira@jacaranda.org>
|
2016-07-21 12:35:59 -07:00 |
|
meejah
|
0d466ec1f9
|
add excluded check
|
2016-07-21 12:35:59 -07:00 |
|
meejah
|
c883977eb6
|
add the 'spurious' notifies
|
2016-07-21 12:35:59 -07:00 |
|
Daira Hopwood
|
c156581b73
|
Fix a pyflakes warning and check existence of file in Bob's local dir.
Signed-off-by: Daira Hopwood <daira@jacaranda.org>
|
2016-07-21 12:35:59 -07:00 |
|
meejah
|
d61b8ed39e
|
implement 'delete' functionality, with tests
|
2016-07-21 12:35:59 -07:00 |
|
meejah
|
946656b249
|
smoketest for magic-folder functionality
|
2016-07-21 12:35:59 -07:00 |
|
Daira Hopwood
|
cec315da49
|
Add test that we don't write files outside the magic folder directory. refs ticket:2506
Signed-off-by: Daira Hopwood <daira@jacaranda.org>
|
2016-07-21 12:35:59 -07:00 |
|
Daira Hopwood
|
567668eb8c
|
Fix infinite loop in should_ignore_path for absolute paths.
Signed-off-by: Daira Hopwood <daira@jacaranda.org>
|
2016-07-21 12:35:59 -07:00 |
|
Daira Hopwood
|
5d5d804719
|
More debug logging.
Signed-off-by: Daira Hopwood <daira@jacaranda.org>
|
2016-07-21 12:35:59 -07:00 |
|
Daira Hopwood
|
57753a62bc
|
Unicode fix for do_join.
Signed-off-by: Daira Hopwood <daira@jacaranda.org>
|
2016-07-21 12:35:59 -07:00 |
|
Daira Hopwood
|
7d2f30643e
|
Minor cleanups to tests.
Signed-off-by: Daira Hopwood <daira@jacaranda.org>
|
2016-07-21 12:35:59 -07:00 |
|
Daira Hopwood
|
f754938cc9
|
Ensure that errors from Alice-and-Bob tests are reported correctly if setup fails.
Signed-off-by: Daira Hopwood <daira@jacaranda.org>
|
2016-07-21 12:35:59 -07:00 |
|
Daira Hopwood
|
b56c3e06e4
|
Cosmetics.
Signed-off-by: Daira Hopwood <daira@jacaranda.org>
|
2016-07-21 12:35:59 -07:00 |
|
Daira Hopwood
|
2a7bb6f444
|
Eliminate duplicate parsing of invite code.
Signed-off-by: Daira Hopwood <daira@jacaranda.org>
|
2016-07-21 12:35:59 -07:00 |
|
Daira Hopwood
|
c28594268e
|
Remaining test fixes.
Signed-off-by: Daira Hopwood <daira@jacaranda.org>
|
2016-07-21 12:35:59 -07:00 |
|
Daira Hopwood
|
a5874070e3
|
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>
|
2016-07-21 12:35:59 -07:00 |
|
Daira Hopwood
|
ed2d27e712
|
Cosmetics.
Signed-off-by: Daira Hopwood <daira@jacaranda.org>
|
2016-07-21 12:35:59 -07:00 |
|
Daira Hopwood
|
643a105991
|
URIs are strs.
Signed-off-by: Daira Hopwood <daira@jacaranda.org>
|
2016-07-21 12:35:59 -07:00 |
|
Daira Hopwood
|
59eede8e88
|
Aliases and nicknames are Unicode.
Signed-off-by: Daira Hopwood <daira@jacaranda.org>
|
2016-07-21 12:35:59 -07:00 |
|
Daira Hopwood
|
bb596b017d
|
Fix call to argv_to_abspath. Also rename localdir to local_dir.
Signed-off-by: Daira Hopwood <daira@jacaranda.org>
|
2016-07-21 12:35:59 -07:00 |
|
David Stainton
|
b32b61e727
|
Fix magic-folder cli tests
convert path to abs path when matching
strings in the generated config file.
|
2016-07-21 12:35:59 -07:00 |
|
David Stainton
|
a1beef34a7
|
Attempt to fix cli tests
|
2016-07-21 12:35:59 -07:00 |
|
Daira Hopwood
|
b2d494837c
|
Better but still broken tests.
Signed-off-by: Daira Hopwood <daira@jacaranda.org>
|
2016-07-21 12:35:59 -07:00 |
|
Daira Hopwood
|
903c6f1d6c
|
Fix check for initial '-' in argv_to_abspath.
Signed-off-by: Daira Hopwood <daira@jacaranda.org>
|
2016-07-21 12:35:59 -07:00 |
|
David Stainton
|
0789d295a6
|
Fix tests by submitting unicode args instead of str
|
2016-07-21 12:35:59 -07:00 |
|
David Stainton
|
16275cb8f6
|
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
|
2016-07-21 12:35:59 -07:00 |
|
David Stainton
|
941f67f3b0
|
Use argv_to_abspath for magic-folder join file path arg
|
2016-07-21 12:35:59 -07:00 |
|
Daira Hopwood
|
5f6783e382
|
Test creation of a subdirectory.
Signed-off-by: Daira Hopwood <daira@jacaranda.org>
|
2016-07-21 12:35:59 -07:00 |
|