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
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
06a1ada624
Remove double-encoding of magic-folder params
2018-04-20 14:43:34 -04:00
Jean-Paul Calderone
b9939f7d4d
link to inotify wikipedia page
2018-04-20 14:42:33 -04:00
Jean-Paul Calderone
890360c8ea
Merge pull request #486 from exarkun/2915.disable-hypothesis-deadline
...
Disable hypothesis deadline and "too slow" health check on CI
2018-04-04 07:32:13 -04:00
Jean-Paul Calderone
2bd63ce27a
Tell tox to pass the new env var through
2018-04-03 14:07:17 -04:00
Jean-Paul Calderone
dc4d30f7c2
Switch to TAHOE_LAFS prefix
2018-04-03 14:07:12 -04:00
Jean-Paul Calderone
6bca749592
this is still needed
2018-04-03 13:59:35 -04:00
Jean-Paul Calderone
a218b68d98
Configure CI to use the Hypothesis CI profile
2018-04-03 13:16:53 -04:00
Jean-Paul Calderone
f6f617c33c
Teach it about a CI profile
...
This profile does not have time-based warnings.
2018-04-03 13:15:54 -04:00
Jean-Paul Calderone
da2e4a80cd
Get rid of these individual suppressions
2018-04-03 13:15:54 -04:00
Brian Warner
05edde9a64
setup.py: unpin pypiwin32, should be fixed by now
...
At the time we pinned this to v219, I think the v220 on PyPI was broken for
py2.7, or they'd stopped producing newer wheels for py2 but the most recent
py2-capable one was broken. The upstream bug is fixed, so I'll unpin this and
see if it works.
2018-03-30 11:46:15 -07:00
Brian Warner
0c01a5e920
NEWS: update (unedited) to include everything since last release
2018-03-30 11:44:49 -07:00
Brian Warner
920d494e36
appveyor: add _trial_temp/test.log as an "artifact"
...
Name it "trial_test_log.txt", so it can be read in a browser, not just
downloaded.
I'm hoping this will help track down why
test_magic_folder.RealTest.test_batched_process occasionally times out on
windows.
2018-03-29 19:25:50 -07:00
Brian Warner
a9d10a5a57
Merge branch 'tox-pyinstaller'
2018-03-29 12:19:01 -07:00
Brian Warner
91f639f0d2
travis: add pyinstaller job
...
We aren't yet using these artifacts (we plan to build the production ones on
our buildbot machines), but this will make sure we don't break the process.
2018-03-29 12:12:20 -07:00
Brian Warner
f1a853e115
travis: simplify commands
...
We do everything with tox, so the MODE environment variable is really just a
tox environment identifier
2018-03-29 12:11:35 -07:00
Brian Warner
ba835b1414
Merge PR482: fix PyInstaller generation
2018-03-29 11:44:24 -07:00
Chris Wood
8c81ca7958
Remove 'deps = .' from pyinstaller tox testenv
2018-03-29 14:29:42 -04:00
