Commit Graph

11221 Commits

Author SHA1 Message Date
4ac95a1ede Merge remote-tracking branch 'origin/master' into 3522.test_alias-no-mock 2020-12-10 07:19:43 -05:00
6f80862ec5 Slightly clean up formatting implementation 2020-12-10 07:19:27 -05:00
066e98874b Point at do_cli_unicode here too 2020-12-10 07:17:24 -05:00
d0c22a529e json.dumps output should always be ascii 2020-12-10 07:16:00 -05:00
2f53225765 better helper name 2020-12-10 07:06:01 -05:00
4bb28cadcb motivate its existence a bit more 2020-12-10 07:04:28 -05:00
c39f7721af run_cli_bytes docstring 2020-12-10 07:03:24 -05:00
Itamar Turner-Trauring
489b369218
Merge pull request #916 from tahoe-lafs/3456.introducer-python3
Port allmydata.introducer to Python 3

Fixes ticket:3546
2020-12-09 10:52:18 -05:00
Itamar Turner-Trauring
67549aaed5 Merge remote-tracking branch 'origin/master' into 3456.introducer-python3 2020-12-09 09:21:02 -05:00
Itamar Turner-Trauring
dab89f433c
Merge pull request #914 from tahoe-lafs/3544.furls-not-bytes-maybe
Makes furls not bytes

Fixes ticket:3544
2020-12-09 09:20:32 -05:00
Itamar Turner-Trauring
0cf9be18d7 Merge remote-tracking branch 'origin/master' into 3544.furls-not-bytes-maybe 2020-12-08 16:08:12 -05:00
Jean-Paul Calderone
8f3acb7eb6
Merge pull request #918 from tahoe-lafs/3521.test_storage_client-no-mock
Remove Mock usage from test_storage_client

Fixes: ticket:3521
2020-12-08 15:36:28 -05:00
Itamar Turner-Trauring
754b88a0b9 Fix failing test. 2020-12-08 13:47:53 -05:00
69d3dad646 Get rid of remote_host / get_remote_host
Nothing uses it and if we don't provide it we don't need getLocationHints
2020-12-08 10:37:31 -05:00
eddf7fd8f9 Remove the pre-generated key/certificate 2020-12-08 10:34:25 -05:00
Itamar Turner-Trauring
dcd865897e
Merge branch 'master' into 3544.furls-not-bytes-maybe 2020-12-08 10:30:00 -05:00
Itamar Turner-Trauring
0b7c0bf451 Document furl type. 2020-12-08 10:28:47 -05:00
d83e4790c3 Let subscribed_to get initialized right 2020-12-07 13:14:00 -05:00
Jean-Paul Calderone
d415bda72a
Merge branch 'master' into 3521.test_storage_client-no-mock 2020-12-07 12:03:50 -05:00
61ee26fb00 ticket reference 2020-12-07 10:46:20 -05:00
1a77ba5698 remove redundant u prefix 2020-12-07 10:37:25 -05:00
d6d64f6b27 fix the json case 2020-12-07 10:37:22 -05:00
87e808b392 one more switch 2020-12-07 10:18:05 -05:00
c7358e6639 Switch over to the helper in the two functions that matter for this PR 2020-12-07 10:16:48 -05:00
a8e3424ef6 remove another unrelated change that's no longer required 2020-12-07 09:55:27 -05:00
d2664121b9 backout no-longer required unrelated change 2020-12-07 09:51:34 -05:00
72744c9464 more docstrings and properly support (and use) encoding=None throughout 2020-12-07 09:47:48 -05:00
05d271c7c8 a little more exposition 2020-12-07 09:26:58 -05:00
7b3a5aceb8 These tests can't reach any of the codepaths where quote_output matters
So simplify
2020-12-07 09:21:56 -05:00
f4432d3f23 Respect the provided encoding
UTF-8 is great but if we're claiming the encoding is something else everywhere
else we can't just make it UTF-8 here.
2020-12-07 09:12:38 -05:00
56f141e170 decode instead of encoding in maybe_decode
legacy from when the bytes/unicode tower was upsidedown compared to how it is now
2020-12-07 09:12:04 -05:00
72a5b571ca Only test the cases we can make work everywhere
These tests previously (in this branch) tried to exercise more ``show_output``
logic than they can actually reach due to the requirement that argv be
interpretable.  Shrink the test suite down to just what we can squeeze through
argv and deal with fully testing ``show_output`` elsewhere.
2020-12-07 09:10:59 -05:00
93b30d0dde The implementation can't reliably see the encoding we're faking without this 2020-12-07 09:06:21 -05:00
8ca98bb8ca using run_cli_unicode, better expect unicode result 2020-12-07 09:06:00 -05:00
c12b082fa7 Put run_cli back largely how it was
Also deal with StringIO better in show_output
2020-12-06 20:37:28 -05:00
613777d166 Make sure this one is bytes too 2020-12-06 19:23:13 -05:00
5aee8b422d Oops there's another case 2020-12-06 18:39:09 -05:00
2955d22f72 note a problem with test_system 2020-12-06 18:38:51 -05:00
b464fa6483 docstring 2020-12-06 18:28:11 -05:00
77bebb9916 [wip] remove mock from test_alias, along with a bunch of encoding-related changes :/ 2020-12-06 17:00:34 -05:00
c4b58fe00b unused import 2020-12-06 11:04:19 -05:00
d29210a140 unused import 2020-12-06 11:04:05 -05:00
238590d7fd Remove mock by removing a bunch of unicode shenanigans 2020-12-06 11:03:44 -05:00
dea42c474f news fragment 2020-12-06 11:03:31 -05:00
8278fa9c62 Name the pem so it gets installed
Also use the new_tub helper that reads the pem so we don't have to generate a
new cert in this test
2020-12-06 10:39:25 -05:00
386f30fa79 Remove Mock from test_threshold_reached 2020-12-06 10:30:08 -05:00
Jean-Paul Calderone
08a36d1e0d
Merge pull request #917 from tahoe-lafs/3547.furl-py36-regression
Fix the furl/py36 test suite regression

Fixes: ticket:3547
2020-12-06 09:40:12 -05:00
Jean-Paul Calderone
24709fa758
Merge branch 'master' into 3547.furl-py36-regression 2020-12-05 13:29:27 -05:00
Jean-Paul Calderone
81a6bfc8fd
Merge pull request #908 from tahoe-lafs/3520.test_client-no-mock
Remove mock usage from test_client

Fixes: ticket:3520
2020-12-05 13:28:40 -05:00
Jean-Paul Calderone
d7f005badd
Merge branch 'master' into 3520.test_client-no-mock 2020-12-05 12:55:25 -05:00