Commit Graph

7582 Commits

Author SHA1 Message Date
meejah
cec3746682 explicit umask and skip part of test on windows 2018-05-01 16:45:50 -06:00
meejah
c9e00a988a
Merge pull request #475 from meejah/2909.backup-behavior.0
#2909 fix .backup file behavior and (some of) the incorrect .conflict cases (#2911)
2018-05-01 15:52:10 -06:00
Jean-Paul Calderone
e0c73e0ea1 Merge remote-tracking branch 'origin/master' into 1455.x-frame-options.2 2018-05-01 14:39:48 -04:00
Jean-Paul Calderone
4cc1c2171d Merge remote-tracking branch 'origin/master' into 2879.magic-folder-create-and-umask.0 2018-05-01 14:24:54 -04:00
meejah
458889682c
Merge pull request #493 from exarkun/lgtm-configuration
Add recommended lgtm configuration.
2018-05-01 11:09:29 -06:00
meejah
5bbf0abe9d
Merge pull request #490 from exarkun/pending-deprecations
Avoid pending Twisted deprecations
2018-05-01 11:07:09 -06:00
meejah
5414930184 not sure why we assert this 2018-05-01 10:52:12 -06:00
meejah
e719a3b4d6 more-robust tests 2018-04-30 14:55:52 -06:00
meejah
2cd74dbb3a exception name wrong in super() 2018-04-30 14:55:52 -06:00
meejah
0d7a703756 simplify some utility code 2018-04-30 14:55:52 -06:00
meejah
c5a20127a1 unify tests 2018-04-30 14:55:52 -06:00
meejah
21c6825172 fix exception stuff 2018-04-30 14:55:52 -06:00
meejah
b54d5d88f8 unused var 2018-04-30 14:55:52 -06:00
meejah
158498f61a 'positive' version of assert 2018-04-30 14:55:52 -06:00
meejah
a0546fff7b custom exception types 2018-04-30 14:55:51 -06:00
meejah
6352db9c01 comment + logging cleanup 2018-04-30 14:55:51 -06:00
meejah
c445ac4c14 use custom exception type 2018-04-30 14:55:51 -06:00
meejah
113f87a931 whitespace 2018-04-30 14:55:51 -06:00
meejah
7cb36bda7e unused code 2018-04-30 14:55:51 -06:00
meejah
c71116d45e keep original exception behavior 2018-04-30 14:55:51 -06:00
meejah
b53ea0a11c redundant 2018-04-30 14:55:51 -06:00
meejah
04734dcfcb redundant test code 2018-04-30 14:55:51 -06:00
meejah
c2aec93209 fix windows move_into_place logic 2018-04-30 14:55:51 -06:00
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