Commit Graph

6697 Commits

Author SHA1 Message Date
Jean-Paul Calderone
624916e06b
Merge branch 'master' into 3550.remove-start-stop-restart-daemonize 2020-12-10 19:47:47 -05:00
Jean-Paul Calderone
1c7c228f90 Merge remote-tracking branch 'origin/master' into 3549.remove-stats-gatherer 2020-12-10 18:27:54 -05:00
Jean-Paul Calderone
e8e928aced Remove the web view onto the removed metrics 2020-12-10 18:24:00 -05:00
Itamar Turner-Trauring
e9b0a526bd
Merge branch 'master' into 3551.more-immutable-python-3 2020-12-10 10:06:53 -05:00
Jean-Paul Calderone
4ac95a1ede Merge remote-tracking branch 'origin/master' into 3522.test_alias-no-mock 2020-12-10 07:19:43 -05:00
Jean-Paul Calderone
6f80862ec5 Slightly clean up formatting implementation 2020-12-10 07:19:27 -05:00
Jean-Paul Calderone
066e98874b Point at do_cli_unicode here too 2020-12-10 07:17:24 -05:00
Jean-Paul Calderone
d0c22a529e json.dumps output should always be ascii 2020-12-10 07:16:00 -05:00
Jean-Paul Calderone
2f53225765 better helper name 2020-12-10 07:06:01 -05:00
Jean-Paul Calderone
4bb28cadcb motivate its existence a bit more 2020-12-10 07:04:28 -05:00
Jean-Paul Calderone
c39f7721af run_cli_bytes docstring 2020-12-10 07:03:24 -05:00
Jean-Paul Calderone
d29d9c57e7 These values aren't used for the exercised codepaths
So just use None instead.  Kind of a weak fix but a fix nonetheless.
2020-12-10 06:59:41 -05:00
Jean-Paul Calderone
89441d9169 Refactor create_connection_handlers so we don't need Tor and I2P mocks 2020-12-09 16:18:48 -05:00
Jean-Paul Calderone
e2963856d3 Dependency Injection for _tub_portlocation 2020-12-09 15:48:40 -05:00
Itamar Turner-Trauring
96fd1861d2 Port to Python 3. 2020-12-09 14:58:54 -05:00
Itamar Turner-Trauring
bb06067c33 Port to Python 3. 2020-12-09 14:48:33 -05:00
Itamar Turner-Trauring
5cba8a4380 Port to Python 3. 2020-12-09 14:45:07 -05:00
Itamar Turner-Trauring
b1800c457d All tests pass on Python 3. 2020-12-09 14:33:56 -05:00
Itamar Turner-Trauring
ff64432282 More passing on Python 3.. 2020-12-09 14:14:07 -05:00
Itamar Turner-Trauring
59968d099c More passing tests. 2020-12-09 14:05:03 -05:00
Itamar Turner-Trauring
016240d6e6 More passing tests on Python 3. 2020-12-09 13:50:15 -05:00
Itamar Turner-Trauring
6b8fd2f29d Some progress towards passing tests on Python 3. 2020-12-09 13:45:31 -05:00
Itamar Turner-Trauring
48bef7db99 Some straightforward changes to support Python 3. 2020-12-09 13:42:35 -05:00
Itamar Turner-Trauring
63ff67a7be Ported to Python 3. 2020-12-09 13:33:01 -05:00
Itamar Turner-Trauring
eb55c10eea Tests pass on Python 3. 2020-12-09 13:28:16 -05:00
Itamar Turner-Trauring
baed5fd734 Port to Python 3. 2020-12-09 13:22:51 -05:00
Jean-Paul Calderone
74c3990456 This extra stop complexity is no longer needed 2020-12-09 10:57:02 -05:00
Jean-Paul Calderone
5b0190b9a1 Remove some more test code related to start/restart/stop 2020-12-09 10:51:48 -05:00
Jean-Paul Calderone
d346c90c6e This is gonna take some work 2020-12-09 10:51:48 -05:00
Jean-Paul Calderone
ca92fa4eb5 Don't think about "tahoe start" 2020-12-09 10:51:48 -05:00
Jean-Paul Calderone
4d28b0ec27 Get rid of "tahoe start", "tahoe daemonize", "tahoe stop", "tahoe restart" 2020-12-09 10:51:48 -05:00
Jean-Paul Calderone
a34fca8e7a Don't think about "tahoe start" 2020-12-09 10:51:10 -05:00
Jean-Paul Calderone
9a27254afa unused import 2020-12-09 10:39:03 -05:00
Jean-Paul Calderone
9412cf70c2 remove unused helper 2020-12-09 10:36:17 -05:00
Jean-Paul Calderone
d7ec5a19be Don't implement the stats gatherer or support configuring or talking to one 2020-12-09 10:34:16 -05:00
Jean-Paul Calderone
3fd1b336b4 Don't test stats gatherer support in the runner 2020-12-09 10:32:49 -05:00
Jean-Paul Calderone
d916c725e6 Don't set up or query a stats gatherer in test_system 2020-12-09 10:32:26 -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
0cf9be18d7 Merge remote-tracking branch 'origin/master' into 3544.furls-not-bytes-maybe 2020-12-08 16:08:12 -05:00
Itamar Turner-Trauring
754b88a0b9 Fix failing test. 2020-12-08 13:47:53 -05:00
Jean-Paul Calderone
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
Jean-Paul Calderone
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
Jean-Paul Calderone
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
Jean-Paul Calderone
61ee26fb00 ticket reference 2020-12-07 10:46:20 -05:00
Jean-Paul Calderone
1a77ba5698 remove redundant u prefix 2020-12-07 10:37:25 -05:00
Jean-Paul Calderone
d6d64f6b27 fix the json case 2020-12-07 10:37:22 -05:00
Jean-Paul Calderone
87e808b392 one more switch 2020-12-07 10:18:05 -05:00
Jean-Paul Calderone
c7358e6639 Switch over to the helper in the two functions that matter for this PR 2020-12-07 10:16:48 -05:00
Jean-Paul Calderone
a8e3424ef6 remove another unrelated change that's no longer required 2020-12-07 09:55:27 -05:00
Jean-Paul Calderone
d2664121b9 backout no-longer required unrelated change 2020-12-07 09:51:34 -05:00
Jean-Paul Calderone
72744c9464 more docstrings and properly support (and use) encoding=None throughout 2020-12-07 09:47:48 -05:00
Jean-Paul Calderone
05d271c7c8 a little more exposition 2020-12-07 09:26:58 -05:00
Jean-Paul Calderone
7b3a5aceb8 These tests can't reach any of the codepaths where quote_output matters
So simplify
2020-12-07 09:21:56 -05:00
Jean-Paul Calderone
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
Jean-Paul Calderone
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
Jean-Paul Calderone
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
Jean-Paul Calderone
93b30d0dde The implementation can't reliably see the encoding we're faking without this 2020-12-07 09:06:21 -05:00
Jean-Paul Calderone
8ca98bb8ca using run_cli_unicode, better expect unicode result 2020-12-07 09:06:00 -05:00
Jean-Paul Calderone
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
Jean-Paul Calderone
613777d166 Make sure this one is bytes too 2020-12-06 19:23:13 -05:00
Jean-Paul Calderone
5aee8b422d Oops there's another case 2020-12-06 18:39:09 -05:00
Jean-Paul Calderone
2955d22f72 note a problem with test_system 2020-12-06 18:38:51 -05:00
Jean-Paul Calderone
b464fa6483 docstring 2020-12-06 18:28:11 -05:00
Jean-Paul Calderone
77bebb9916 [wip] remove mock from test_alias, along with a bunch of encoding-related changes :/ 2020-12-06 17:00:34 -05:00
Jean-Paul Calderone
c4b58fe00b unused import 2020-12-06 11:04:19 -05:00
Jean-Paul Calderone
d29210a140 unused import 2020-12-06 11:04:05 -05:00
Jean-Paul Calderone
238590d7fd Remove mock by removing a bunch of unicode shenanigans 2020-12-06 11:03:44 -05:00
Jean-Paul Calderone
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
Jean-Paul Calderone
386f30fa79 Remove Mock from test_threshold_reached 2020-12-06 10:30:08 -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
d7f005badd
Merge branch 'master' into 3520.test_client-no-mock 2020-12-05 12:55:25 -05:00
Jean-Paul Calderone
ac7491680b fix unicode/bytes stuff in the affected tests 2020-12-05 09:06:45 -05:00
Jean-Paul Calderone
bdc75c3361 Merge remote-tracking branch 'origin/master' into 3539.nodemaker-weakrefdict 2020-12-05 07:23:54 -05:00
Itamar Turner-Trauring
c1a699dede Flake. 2020-12-04 11:39:57 -05:00
Itamar Turner-Trauring
22dcd726e6 Port to Python 3. 2020-12-04 11:36:17 -05:00
Itamar Turner-Trauring
15735e70bc Port to Python 3. 2020-12-04 11:35:59 -05:00
Jean-Paul Calderone
15d0207f89
Merge pull request #897 from tahoe-lafs/3504.private-introducer-furl
Deprecate tahoe.cfg [client]introducer.furl

Fixes: ticket:3504
2020-12-04 09:44:19 -05:00
Itamar Turner-Trauring
0386924d00 Fix flake. 2020-12-02 15:26:25 -05:00
Itamar Turner-Trauring
b716456019 Merge remote-tracking branch 'origin/master' into 3544.furls-not-bytes-maybe 2020-12-02 15:24:31 -05:00
Itamar Turner-Trauring
71d287c1c1
Merge pull request #905 from tahoe-lafs/3514.test-introducer-python-3
Port test_introducer.py to Python 3

Fixes ticket:3514
2020-12-02 15:24:17 -05:00
Jean-Paul Calderone
a0d46c6f09 Merge remote-tracking branch 'origin/master' into 3504.private-introducer-furl 2020-12-02 09:22:09 -05:00
Itamar Turner-Trauring
587222033d Fix bad merge. 2020-12-01 11:58:56 -05:00
Itamar Turner-Trauring
d5ba1be5bc Passing tests. 2020-11-30 17:56:50 -05:00
Itamar Turner-Trauring
17ec22ab84 Even more debytification of furls. 2020-11-30 17:55:37 -05:00
Itamar Turner-Trauring
22c328d6d3 More debytification. 2020-11-30 17:41:15 -05:00
Itamar Turner-Trauring
67694889da Some progress towards ripping out furls-as-bytes. 2020-11-30 17:20:39 -05:00
Itamar Turner-Trauring
27102c0d89 Merge remote-tracking branch 'origin/master' into 3514.test-introducer-python-3 2020-11-30 16:47:21 -05:00
Itamar Turner-Trauring
8615c1ade8 Try to fix sorting on Python 3. 2020-11-30 16:45:14 -05:00
Itamar Turner-Trauring
eaca639b6f Undo changes that should probably be in a different branch. 2020-11-30 16:28:26 -05:00
Itamar Turner-Trauring
413cf75d54 Uses clearer issuperset(). 2020-11-30 16:25:24 -05:00
Itamar Turner-Trauring
9f7ae56a82 Make the explanation less nonsensical. 2020-11-30 16:24:27 -05:00
Jean-Paul Calderone
17ed8afd2f Make the new test data files installable
There's an existing rule that matches *.txt
2020-11-30 13:37:21 -05:00
Jean-Paul Calderone
ef2f7e6136 unused import 2020-11-30 13:27:46 -05:00
Jean-Paul Calderone
2ac4af7fb4 Add some direct tests for NodeMaker.create_from_uri 2020-11-30 13:26:32 -05:00
Jean-Paul Calderone
4ca45aaa93 Catch basedir type errors earlier 2020-11-30 13:23:18 -05:00
Jean-Paul Calderone
01ab8d3ee9 Don't look before you leap 2020-11-30 08:56:45 -05:00
Jean-Paul Calderone
84088e4f41 unused import 2020-11-26 21:18:58 -05:00