Commit Graph

7659 Commits

Author SHA1 Message Date
meejah
41e6ec0fff integration test fixups 2018-04-30 14:55:51 -06:00
meejah
fbc142d346 re-jig 'the logic' 2018-04-30 14:55:51 -06:00
meejah
6d5355fda3 moar unit-tests 2018-04-30 14:55:51 -06:00
meejah
1f529567ca fix commented code 2018-04-30 14:55:51 -06:00
meejah
7c71194eea utest fixup 2018-04-30 14:55:51 -06:00
meejah
5f417c5179 objects_conflicted fixup 2018-04-30 14:55:51 -06:00
meejah
99c3d7f23f this shouldn't have gotten removed 2018-04-30 14:55:51 -06:00
meejah
a146afcf84 refactor integration tests 2018-04-30 14:55:51 -06:00
meejah
16d59ab582 fix integration test 2018-04-30 14:55:51 -06:00
meejah
927ee097e5 remove prints 2018-04-30 14:55:51 -06:00
meejah
65ceda3a32 fix conflict behavior 2018-04-30 14:55:51 -06:00
meejah
7975efbe8d whitespace and a comment 2018-04-30 14:55:51 -06:00
meejah
cc93a12a85 Test fixups 2018-04-30 14:55:51 -06:00
meejah
435b30c7aa use local last_uploaded_uri, last class of conflict from spec 2018-04-30 14:55:51 -06:00
meejah
affb80e39e test fixups 2018-04-30 14:55:51 -06:00
meejah
47b1787633 stop writing .backup files for normal overwrites 2018-04-30 14:55:51 -06:00
meejah
e000047932 integration-test for #2909 2018-04-30 14:55:51 -06:00
meejah
9e5a6ac123 test_smoke -> test_magic_folder 2018-04-30 14:55:51 -06:00
meejah
a1db8f4708 some logging fixups and notes on backup behavior 2018-04-30 14:55:51 -06:00
Jean-Paul Calderone
97aff20cfd Disable another lgtm query. 2018-04-26 15:41:38 -04:00
Jean-Paul Calderone
60bebd0659 Turn off another lgtm query.
It's not good.
2018-04-26 15:35:56 -04:00
Jean-Paul Calderone
b623a4a199 Remove dead Tor TCP control port setup code.
If someone wants this I bet they can figure it out.
2018-04-26 15:32:27 -04:00
Jean-Paul Calderone
87daa3ec5a Remove dead debug logging code. 2018-04-26 15:32:02 -04:00
Jean-Paul Calderone
3705264740 Use preferred exception raising syntax.
Also, make the `WindowsError` class "reachable".
2018-04-26 15:27:00 -04:00
Jean-Paul Calderone
b6d33c92ff Remove disabled ad hoc debug logging 2018-04-26 15:26:17 -04:00
Jean-Paul Calderone
8d4d000132 Fix pre-release matching regex character class
Previously matched any single character from `abc|r` (with duplicate
specification of `c`).  Now matches any single character from `abc` or
the two character sequence `rc`.

I guess this was the intent, anyway.
2018-04-26 15:20:27 -04:00
Jean-Paul Calderone
6b16afaa2e Avoid using the list comprehension loop variable
It works fine but it relies on leaky scopes.
2018-04-26 15:16:00 -04:00
Jean-Paul Calderone
9f8c90393f Remove dead synopsis definition 2018-04-26 15:10:02 -04:00
Jean-Paul Calderone
7609fd1861 Remove impossible third codepath 2018-04-26 15:09:01 -04:00
Jean-Paul Calderone
64243527eb Remove the strange option to not use flog 2018-04-26 15:08:14 -04:00
Jean-Paul Calderone
0f5d0e3131 Comment out "testing" code... 2018-04-26 15:07:09 -04:00
Jean-Paul Calderone
206ab732e6 Replace use of deprecated sha module 2018-04-26 15:00:36 -04:00
Jean-Paul Calderone
6d9f0c59b7 Remove pointless conditional 2018-04-26 14:59:47 -04:00
Jean-Paul Calderone
da9d0ded94 Remove pointless conditional 2018-04-26 14:59:18 -04:00
Jean-Paul Calderone
f99b3bdbda Remove complicated and dead code 2018-04-26 14:58:40 -04:00
Jean-Paul Calderone
cc6006dcb3 Replace use of deprecated sha module 2018-04-26 14:57:45 -04:00
Jean-Paul Calderone
be0317632f Turn off a query that generates spurious errors 2018-04-26 14:50:25 -04:00
Jean-Paul Calderone
2bc4aa7d14 Add recommended lgtm configuration. 2018-04-26 14:35:42 -04:00
Jean-Paul Calderone
a7218cb16f Some nice documnetation and proper exception types 2018-04-23 18:46:12 -04:00
Jean-Paul Calderone
169ccbfbca directory creation fixes 2018-04-23 18:46:07 -04:00
Jean-Paul Calderone
c5f95f026e
Merge pull request #491 from exarkun/consolidate-magicfolder-config
Consolidate magic-folder configuration-loading code.
2018-04-23 15:50:26 -04:00
Jean-Paul Calderone
035dc6dc76 reduce fragility of tests .. maybe?
only trivially, at best, of course.
2018-04-23 11:41:36 -04:00
Jean-Paul Calderone
e1c469e3b6 make sure we pass the client node 2018-04-23 11:41:29 -04:00
Jean-Paul Calderone
cfa33332a5 Add missing information/import 2018-04-23 11:09:24 -04:00
Jean-Paul Calderone
8d104dab1c Move the complicated MagicFolder constructor
All that complexity can be part of MagicFolder itself.
2018-04-23 10:59:33 -04:00
Jean-Paul Calderone
ac6269dd2d Only read magic-folder config from config reader
Also, fix the umask feature which was completely broken previously due
to failure to parse the umask string into an integer.
2018-04-23 10:41:48 -04:00
Jean-Paul Calderone
0bdabacce3 document the node_directory parameter 2018-04-23 10:41:48 -04:00
Jean-Paul Calderone
933d74c1bb
Merge pull request #489 from exarkun/magic-folder-cleanups
Make some trivial magic-folder-related code/doc improvements.
2018-04-20 17:50:44 -04:00
Jean-Paul Calderone
8eb83bbfb9 avoid about-to-be-deprecated getClientIP if we can
Use the replacement, getClientAddress.  But have a fallback to
getClientIP to keep supporting older versions of Twisted.
2018-04-20 16:03:19 -04:00
Jean-Paul Calderone
edf3c7aac7 reformat to fit within 80 cols 2018-04-20 15:59:35 -04:00