Commit Graph

6421 Commits

Author SHA1 Message Date
Itamar Turner-Trauring
6007c1f67f Some tests are passing. 2020-08-27 15:36:54 -04:00
Itamar Turner-Trauring
c3494f1356 Enough changes to make allmydata.test.test_storage run on Python 3.
Still lots of failures, of course.
2020-08-27 15:19:49 -04:00
Itamar Turner-Trauring
f998e0e752 Merge remote-tracking branch 'origin/master' into 3396.storage-tests-python-3 2020-08-27 15:15:46 -04:00
Itamar Turner-Trauring
6f2f460bf3 Merge remote-tracking branch 'origin/master' into 3374.codec-monitor-python-3-take-2 2020-08-27 14:53:45 -04:00
Itamar Turner-Trauring
7da73c1a03
Merge pull request #772 from tahoe-lafs/3377.configutil-connection_status-python-3
Port configutil and connection_status to Python 3

Fixes ticket:3377
2020-08-27 14:51:26 -04:00
Sajith Sasidharan
d5b5177e13 Keep old comment 2020-08-27 12:56:04 -04:00
Sajith Sasidharan
2c8853b4c6 Test error code and message when resource format is unknown 2020-08-27 12:54:46 -04:00
Sajith Sasidharan
5e3eb1fbe5 Remove web.common.MultiFormatPage, again
Merged master, which had MultiFormatPage.  Accepted upstream changes,
and removed MultiFormatPage again, rather than manually fixing all the
merge conflicts.
2020-08-26 21:20:54 -04:00
Sajith Sasidharan
d79880bf91 Merge 'origin/master' into 3382.remove-multi-format-page 2020-08-26 21:18:44 -04:00
Itamar Turner-Trauring
36177574be Fix lint. 2020-08-26 11:01:04 -04:00
Itamar Turner-Trauring
b3460dcddc Fix lint. 2020-08-26 11:00:19 -04:00
Itamar Turner-Trauring
637e8a0544 Remove duplication. 2020-08-26 10:59:10 -04:00
Itamar Turner-Trauring
a758f32edf Try to make test_storage import on Python 3. 2020-08-26 10:53:02 -04:00
Itamar Turner-Trauring
431e939bb8 Finish porting test_storage_web to Python 3. 2020-08-26 10:38:52 -04:00
Itamar Turner-Trauring
3d18b24967 Port even more tests to Python 3. 2020-08-26 10:38:15 -04:00
Itamar Turner-Trauring
8682550961 More passing tests on Python 3. 2020-08-26 10:35:25 -04:00
Sajith Sasidharan
236d37900e Trim comment lines 2020-08-26 09:58:42 -04:00
Sajith Sasidharan
25f1a41886 Aim for minimal diffs in comments 2020-08-26 09:39:24 -04:00
Itamar Turner-Trauring
23671b02a4 Merge remote-tracking branch 'origin/master' into 3387.expirer-python-3 2020-08-25 13:57:32 -04:00
Sajith Sasidharan
82ee45c1ac Merge 'origin/master' into 3382.remove-multi-format-page 2020-08-25 13:54:05 -04:00
Sajith Sasidharan
f51c127d6d
Merge pull request #780 from sajith/3381.directory-deep-size-results-to-twisted-web
Port web.directory.DeepSizeResults to twisted web

Fixes: ticket:3381
2020-08-25 13:52:15 -04:00
Itamar Turner-Trauring
b3c1302643 Merge remote-tracking branch 'origin/master' into 3387.expirer-python-3 2020-08-25 12:31:12 -04:00
Itamar Turner-Trauring
d5ba10544e Keep interfaces more backwards compatible. 2020-08-25 12:08:59 -04:00
Itamar Turner-Trauring
37ca3c5181 This should be bytes, as it's encoded as URI extension which still expects bytes. 2020-08-25 11:55:12 -04:00
Itamar Turner-Trauring
6726c6ec5b Merge remote-tracking branch 'origin/master' into 3374.codec-monitor-python-3-take-2 2020-08-25 11:48:31 -04:00
Itamar Turner-Trauring
43f95238d8 Merge remote-tracking branch 'origin/master' into 3377.configutil-connection_status-python-3 2020-08-25 11:44:48 -04:00
Itamar Turner-Trauring
2cc21e9893 Finish the port. 2020-08-24 13:57:46 -04:00
Itamar Turner-Trauring
0e15712e34 Tests pass on Python 2 and 3. 2020-08-24 13:53:27 -04:00
Itamar Turner-Trauring
388f27d206 Some more porting, tests pass on Python 2. 2020-08-24 13:41:58 -04:00
Itamar Turner-Trauring
e22bed447b Some updates for URI tests. 2020-08-24 13:10:17 -04:00
Itamar Turner-Trauring
625e2611c1 Address some review comments. 2020-08-24 11:59:52 -04:00
Jason R. Coombs
160f2b9628 Add TODO reflecting transient state of the check. 2020-08-24 11:46:48 -04:00
Sajith Sasidharan
57fdead1c3 Remove allmydata.web._nevow_106 2020-08-22 17:21:24 -04:00
Sajith Sasidharan
fa36fb9ab9 Remove unused allmydata.test.common_web.WebRenderingMixin 2020-08-22 16:47:19 -04:00
Jason R. Coombs
8b553d2045 Add Python 3 compatibility for code paths relevant to 'tahoe --version'. 2020-08-21 19:55:34 -04:00
Jason R. Coombs
2d29265d71 Bypass Python 3 check when running under tox. 2020-08-21 19:55:34 -04:00
Jason R. Coombs
480bec6d0d Rename 'ShortReadOnlySFTPFile.async' to '.async_' for compatibility with Python 3.7 and later. 2020-08-21 19:55:34 -04:00
Itamar Turner-Trauring
71cac5dd44 Merge remote-tracking branch 'origin/master' into 3387.expirer-python-3 2020-08-20 14:56:35 -04:00
Itamar Turner-Trauring
6fd8ae1cc9 Finish port to Python 3. 2020-08-20 14:55:49 -04:00
Itamar Turner-Trauring
9089a1226a
Merge pull request #785 from tahoe-lafs/3386.storage-crawler-python-3
Port allmydata.storage.crawler to Python 3

Fixes ticket:3386
2020-08-20 14:52:30 -04:00
Itamar Turner-Trauring
b3890a1a45 Finish porting (expirer-only) tests to Python 3. 2020-08-20 14:49:58 -04:00
Itamar Turner-Trauring
0912d5adfc Expirer pass on Python 3. 2020-08-20 14:43:10 -04:00
Itamar Turner-Trauring
5d2bdf5883 Explicit bytes. 2020-08-20 14:32:41 -04:00
Itamar Turner-Trauring
8136b21f46 Skip the tests we aren't porting just yet. 2020-08-20 14:24:21 -04:00
Itamar Turner-Trauring
9d34ab587a test_storage_web now runnable on Python 3 (even if it doesn't pass). 2020-08-20 14:17:06 -04:00
Itamar Turner-Trauring
eee3978243 Explain a bit better. 2020-08-20 13:34:00 -04:00
Itamar Turner-Trauring
f227b1b241
Merge pull request #779 from tahoe-lafs/3378.encodingutil-python-3-part-2
Fixes ticket:3378

Port encodingutil to Python 3, part 2
2020-08-20 13:24:33 -04:00
Itamar Turner-Trauring
46b498f99c Merge remote-tracking branch 'origin/master' into 3377.configutil-connection_status-python-3 2020-08-20 13:22:14 -04:00
Itamar Turner-Trauring
be9f02cb13 Should be explicitly bytes. 2020-08-20 13:15:24 -04:00
Itamar Turner-Trauring
5fc95d569f Improve explanations. 2020-08-20 12:39:38 -04:00
Itamar Turner-Trauring
71d33469da Merge remote-tracking branch 'origin/master' into 3378.encodingutil-python-3-part-2 2020-08-20 12:36:36 -04:00
Sajith Sasidharan
ce994ff246 Use twisted's escapeToXml 2020-08-19 15:42:01 -04:00
Sajith Sasidharan
9882d22101 Check for WebError when rendering resource in unknown format 2020-08-19 15:22:06 -04:00
Sajith Sasidharan
d87ffb5ad0 Begone, (most) nevow imports! 2020-08-19 15:22:06 -04:00
Sajith Sasidharan
d2bcebecaa Render resource in a simpler manner 2020-08-19 15:21:28 -04:00
Sajith Sasidharan
320830cf90 Reuse MultiFormatPage tests for MultiFormatResource 2020-08-19 15:21:06 -04:00
Itamar Turner-Trauring
733b2cab36 Remove unnecessary import. 2020-08-19 13:26:57 -04:00
Itamar Turner-Trauring
8279be38c1 Finish porting to Python 3. 2020-08-19 13:25:11 -04:00
Itamar Turner-Trauring
35ac5a62e7 Tests now pass on Python 3 too. 2020-08-19 12:15:39 -04:00
Itamar Turner-Trauring
ff582c5129 Some progress towards running crawler on Python 3. 2020-08-19 11:38:59 -04:00
Itamar Turner-Trauring
e971ccf58e Unbreak so tests pass on Python 2 again. 2020-08-19 11:12:29 -04:00
Itamar Turner-Trauring
e044309bd3 Finish port to Python 3. 2020-08-19 11:03:54 -04:00
Itamar Turner-Trauring
14f349e846 Manual porting to Python 3. 2020-08-19 11:02:26 -04:00
Itamar Turner-Trauring
416ab64335 Fix an import. 2020-08-19 10:50:44 -04:00
Itamar Turner-Trauring
41ad4aea91 Make imports work. 2020-08-18 13:10:57 -04:00
Itamar Turner-Trauring
80b9a9b3ce Split the test module in two. 2020-08-18 13:03:36 -04:00
Sajith Sasidharan
d5853ccb60 Remove web.common.MultiFormatPage 2020-08-18 08:48:02 -04:00
Sajith Sasidharan
c66d38e191 Make web.directory.DeepSizeResults a MultiFormatResource 2020-08-18 08:37:59 -04:00
Itamar Turner-Trauring
97c3be0509 Make quote_* and friends return unicode. 2020-08-17 13:29:49 -04:00
Itamar Turner-Trauring
f95f9c481e Explanation. 2020-08-17 12:04:52 -04:00
Itamar Turner-Trauring
af5e9eaf67 A better name. 2020-08-17 11:29:27 -04:00
Itamar Turner-Trauring
03ed0fd66f Another function that should be a no-op on Python 3. 2020-08-17 11:29:09 -04:00
Itamar Turner-Trauring
81ba354357 Merge remote-tracking branch 'origin/master' into 3373.happinessutil-python-3 2020-08-17 10:45:12 -04:00
Itamar Turner-Trauring
2cc2cb6a7f Rename to_str() to the more accurate to_bytes(). 2020-08-14 13:49:48 -04:00
Itamar Turner-Trauring
4ddbd8dbbf Merge branch '3376.encodingutil-python-3' into 3377.configutil-connection_status-python-3 2020-08-14 13:13:23 -04:00
Itamar Turner-Trauring
2fc8f896b3 Merge remote-tracking branch 'origin/master' into 3376.encodingutil-python-3 2020-08-14 13:09:08 -04:00
Jean-Paul Calderone
bc787975da
Merge pull request #777 from tahoe-lafs/3372.ratchet-by-module.python3.6
Ratchet by module, not by individual test (in python3.6)

Fixes: ticket:3372
2020-08-14 11:55:30 -04:00
Jean-Paul Calderone
76e5c40fc6
Add a module to the test suite which contains all of the other ported modules 2020-08-14 11:21:32 -04:00
meejah
8f1b712a8f
Merge pull request #729 from sajith/3316.check-results-nevow-to-twisted-web
Replace nevow with twisted.web.template in web.check_results
2020-08-13 23:10:19 +00:00
Itamar Turner-Trauring
a3714a9970 Fix whitespace. 2020-08-13 16:32:32 -04:00
Itamar Turner-Trauring
b0c4f6d2ab Fix Python 2 tests. 2020-08-13 16:30:27 -04:00
Itamar Turner-Trauring
6e24defe4b Merge branch '3376.encodingutil-python-3' into 3377.configutil-connection_status-python-3 2020-08-13 15:53:02 -04:00
Itamar Turner-Trauring
8167e85f7b Fix flake8 with __all__. 2020-08-13 15:11:14 -04:00
Itamar Turner-Trauring
2157da524d This needs an encoding too. 2020-08-13 15:04:44 -04:00
Itamar Turner-Trauring
e113cba8d0 Address review comments. 2020-08-13 15:02:59 -04:00
Itamar Turner-Trauring
cdccb93179 Flake fixes. 2020-08-12 15:52:12 -04:00
Itamar Turner-Trauring
5c9294ebf1 Port to Python 3. 2020-08-12 15:46:15 -04:00
Itamar Turner-Trauring
5a0fa7ff73 Test unicode_to_argv(). 2020-08-12 15:40:52 -04:00
Itamar Turner-Trauring
b25f62d189 Clarifications. 2020-08-12 15:40:45 -04:00
Itamar Turner-Trauring
e03c2a759f Port test_encodingutil.py to Python 3. 2020-08-12 15:14:04 -04:00
Itamar Turner-Trauring
b04a65fc16 And more progress to Python 3. 2020-08-12 14:54:07 -04:00
Itamar Turner-Trauring
e9d67b8d0f Even more progress towards Python 3 support. 2020-08-12 14:32:22 -04:00
Itamar Turner-Trauring
f7e28ffb0b More progress towards Python 3. 2020-08-12 14:18:02 -04:00
Itamar Turner-Trauring
53bdc10e19 Some steps towards Python 3 support. 2020-08-12 13:10:10 -04:00
Itamar Turner-Trauring
e13c0cf4d3 Reorganize imports to make Python 3 support easier. 2020-08-12 10:23:30 -04:00
Itamar Turner-Trauring
5dde21f966 Merge remote-tracking branch 'origin/3358.fileutil-to-python-3' into 3376.encodingutil-python-3 2020-08-12 10:15:45 -04:00
Itamar Turner-Trauring
3c5f4f7ddf Merge remote-tracking branch 'origin/master' into 3376.encodingutil-python-3 2020-08-12 10:15:41 -04:00
Itamar Turner-Trauring
14b273953a Better fix, maybe. 2020-08-12 10:10:18 -04:00
Maciej Fijalkowski
c21acc64f0 merge master 2020-08-12 15:42:00 +02:00
Itamar Turner-Trauring
9ad5602477 Fix test failures. 2020-08-11 16:50:42 -04:00
Itamar Turner-Trauring
10378541d7 Use Python 2 ConfigParser, so correct exceptions get raised. 2020-08-11 16:40:00 -04:00
Itamar Turner-Trauring
11b934120c Port to Python 3. 2020-08-11 15:49:59 -04:00
Itamar Turner-Trauring
babe2dbc85 Port to Python 3. 2020-08-11 15:45:52 -04:00
Itamar Turner-Trauring
e24c21bef7 Make configutil tests more standalone, and less repetitive. 2020-08-11 15:38:58 -04:00
Itamar Turner-Trauring
80c7739096 Merge branch '3370.happiness-upload-python-3' into 3373.happinessutil-python-3 2020-08-11 14:54:39 -04:00
Itamar Turner-Trauring
504258622c Docstring. 2020-08-11 14:54:12 -04:00
Itamar Turner-Trauring
202a7cf975 Merge remote-tracking branch 'origin/master' into 3370.happiness-upload-python-3 2020-08-11 14:53:34 -04:00
Itamar Turner-Trauring
a08cde9a4d Port to Python 3. 2020-08-11 14:30:16 -04:00
Itamar Turner-Trauring
243d02ecb1 Port to Python 3. 2020-08-11 14:08:51 -04:00
Itamar Turner-Trauring
1c9e4ec842 Move connection_status tests into their own module. 2020-08-11 14:04:52 -04:00
Itamar Turner-Trauring
39fc75a3fd Tweaks in preparation for Python 3 support. 2020-08-10 13:39:55 -04:00
Itamar Turner-Trauring
24772616c2 Bytes not strings. 2020-08-07 14:13:20 -04:00
Itamar Turner-Trauring
0a2b797c49 Lint fix. 2020-08-07 13:32:12 -04:00
Itamar Turner-Trauring
0e034e06b7 Port to Python 3. 2020-08-07 13:28:14 -04:00
Itamar Turner-Trauring
b82e2ad1c5 Tests for allmydata.monitor. 2020-08-07 13:26:44 -04:00
Itamar Turner-Trauring
9c0b5eac2b Additional testing. 2020-08-07 13:10:55 -04:00
Itamar Turner-Trauring
5384768f76 Port to Python 3. 2020-08-07 13:08:53 -04:00
Itamar Turner-Trauring
7516a5526e Port to Python 3. 2020-08-07 12:57:46 -04:00
Itamar Turner-Trauring
5d70a78cce
Merge pull request #761 from tahoe-lafs/3365.log-python-3
Fixes ticket:3365

Port allmydata.util.log to Python 3
2020-08-07 12:40:58 -04:00
Itamar Turner-Trauring
b08a78e5b4 Docstring. 2020-08-07 11:52:26 -04:00
Itamar Turner-Trauring
6c77a227ff Port to Python 3. 2020-08-07 11:47:24 -04:00
Itamar Turner-Trauring
44143d1b08 Move tests for happinessutil.py into test_happiness.py. 2020-08-07 11:37:44 -04:00
Itamar Turner-Trauring
4d2193fe13 Fix the module name. 2020-08-07 11:12:12 -04:00
Itamar Turner-Trauring
fb9bf5511f Passing tests. 2020-08-07 11:09:41 -04:00
Chad Whitacre
49c631b4c8 Sort the thing we said we'd sort 2020-08-07 08:43:54 -04:00
Sajith Sasidharan
f4cfc0c613 Assign a ticket to unimplemented functionality 2020-08-07 07:19:28 -04:00
Sajith Sasidharan
c52bc6a781 Document "deep check and repair" renderer element 2020-08-07 07:19:28 -04:00
Sajith Sasidharan
36352ee182 Reuse "servers with corrupt shares" from base class 2020-08-07 07:19:28 -04:00
Sajith Sasidharan
c0109b70b6 Remove methods common to base class 2020-08-06 22:43:09 -04:00
Sajith Sasidharan
76777cd4e1 Inherit "deep check and repair" page from "deep check" page 2020-08-06 22:43:09 -04:00
Sajith Sasidharan
3e11779976 Do some error checking 2020-08-06 22:43:04 -04:00
Itamar Turner-Trauring
0622b86b91 Merge remote-tracking branch 'origin/master' into 3370.happiness-upload-python-3 2020-08-06 17:03:43 -04:00
Itamar Turner-Trauring
f53ea4579d Merge remote-tracking branch 'origin/master' into 3365.log-python-3 2020-08-06 17:03:27 -04:00
Itamar Turner-Trauring
d8f74770eb Port to Python 3. 2020-08-06 16:38:19 -04:00
Itamar Turner-Trauring
c6d4ec0295 Port the test module to Python 3. 2020-08-06 16:33:04 -04:00
Itamar Turner-Trauring
32945b85f6 Drop int. 2020-08-06 16:14:39 -04:00
Itamar Turner-Trauring
dab690a757 Flake fixes. 2020-08-06 16:13:10 -04:00
Itamar Turner-Trauring
9669e4eaa7 Drop int. 2020-08-06 16:12:26 -04:00
Maciej Fijalkowski
9b9d530155 Fix some typos. Add docstring 2020-08-06 16:07:50 +02:00
Maciej Fijalkowski
b71ae461a6 use less hacks in yaml tests 2020-08-06 16:06:01 +02:00
Maciej Fijalkowski
57fdd9f6b4 s/unicode/str/ (from future.builtins import str kind of str) 2020-08-06 15:11:41 +02:00
Itamar Turner-Trauring
70851fe753 Death to newint. 2020-08-05 11:53:23 -04:00
Itamar Turner-Trauring
11c7841cd7
Merge pull request #760 from tahoe-lafs/3364.crypto-python-3
Fixes ticket:3364

Port allmydata.crypto to Python 3
2020-08-05 11:26:30 -04:00
Itamar Turner-Trauring
0bef1eb4e2 Support prefix that is bytes. 2020-08-05 11:25:40 -04:00
Itamar Turner-Trauring
ff7cf4d731 Test improvements. 2020-08-04 15:15:32 -04:00
Itamar Turner-Trauring
ce33101d08 Remove unused import. 2020-08-04 15:03:06 -04:00
Maciej Fijalkowski
d8bcbb901e I think default mode is text 2020-08-04 12:26:43 +02:00
Maciej Fijalkowski
d53f67bc41 add assert for write_atomically 2020-08-04 11:15:32 +02:00
Itamar Turner-Trauring
2a623e0b05 Port to Python 3. 2020-08-03 14:13:16 -04:00
Itamar Turner-Trauring
622ed2f971 Standalone logging tests, most of them new, and an attempt to fix the parent
msgid logic so it's a little less broken.
2020-08-03 14:09:28 -04:00
Itamar Turner-Trauring
02daa12031 Move logging tests into their own, Python 3-compatible, module. 2020-08-03 11:33:29 -04:00
Itamar Turner-Trauring
1703230a2a Use nummedobj from pyutil. 2020-08-03 11:33:21 -04:00
Itamar Turner-Trauring
bfbca87f26 Missing from previous PR. 2020-08-03 11:31:02 -04:00
Itamar Turner-Trauring
24729dbd61 Port to Python 3. 2020-08-03 11:06:46 -04:00
Itamar Turner-Trauring
cd50ac434a Port to Python 3. 2020-08-03 10:59:51 -04:00
Itamar Turner-Trauring
5815547661 Remove an unnecessary conversion that breaks Python 3. 2020-08-03 10:58:37 -04:00
Itamar Turner-Trauring
3330737656 Be a bit stricter about expected outputs. 2020-08-03 10:56:47 -04:00
Itamar Turner-Trauring
34e3052814 Don't use global state for testing. 2020-08-03 10:43:21 -04:00
Maciej Fijalkowski
c178c55178 remove this import 2020-08-02 12:03:59 +02:00
Maciej Fijalkowski
bf37413e05 address the review (mostly) 2020-08-02 11:16:18 +02:00
Jean-Paul Calderone
27b6737eaf
Merge remote-tracking branch 'origin/master' into 3358.fileutil-to-python-3
with fijal
2020-07-30 13:38:47 -04:00
Maciej Fijalkowski
ecb3ee023d add a dummy commit 2020-07-30 09:36:11 +02:00
Maciej Fijalkowski
7618b295cb Revert "merge master (I think properly)"
This reverts commit 6140b5ff52, reversing
changes made to da87bd7e7f.
2020-07-30 09:29:20 +02:00
Maciej Fijalkowski
6140b5ff52 merge master (I think properly) 2020-07-29 21:09:23 +02:00
Itamar Turner-Trauring
5e308260b1 Port to Python 3. 2020-07-29 14:49:48 -04:00
Itamar Turner-Trauring
0a1e365ed1 Tests for gcutil. 2020-07-29 14:46:49 -04:00
Itamar Turner-Trauring
9c16a0554e Get rid of unused code. 2020-07-29 14:38:58 -04:00
Maciej Fijalkowski
bfead0630d leave a comment explaining why we removed open 2020-07-29 19:56:29 +02:00
Maciej Fijalkowski
724bf7de75 remove open from imported builtins 2020-07-29 19:56:01 +02:00
Itamar Turner-Trauring
9e4eda6912
Merge pull request #756 from tahoe-lafs/3359.statistics-python-3
Port statistics and dictutil to Python 3

Fixes ticket:3359
2020-07-29 13:16:17 -04:00
Maciej Fijalkowski
93c474c39b make test_util pass under both pythons 2020-07-29 09:00:50 +02:00
Sajith Sasidharan
951250f9ff Remove unused FAVICON_MARKUP 2020-07-28 16:13:58 -04:00
Sajith Sasidharan
4007fb4de7 Rearrange imports 2020-07-28 16:12:48 -04:00
Itamar Turner-Trauring
17b15ae085 Add another test. 2020-07-28 11:25:34 -04:00
Itamar Turner-Trauring
e954314fe5 Don't expose Python 3 dicts to innocent, unsuspecting Python 2 code. 2020-07-28 11:23:40 -04:00
Itamar Turner-Trauring
9ca1fdef81 Note it's ported. 2020-07-28 11:12:17 -04:00
Itamar Turner-Trauring
8c9c691c02 Fix typo. 2020-07-28 11:11:27 -04:00
Itamar Turner-Trauring
cc494e3d39 Document that API returns native strings. 2020-07-28 11:11:05 -04:00
Itamar Turner-Trauring
4dae5d867c Add retry logic, listenOnUnused is potentially flaky. 2020-07-28 11:09:02 -04:00
Sajith Sasidharan
0f28a93879 Remove unused import 2020-07-28 08:08:48 -04:00
Sajith Sasidharan
fb5f9f0c89 Merge 'origin/master' into 3316.check-results-nevow-to-twisted-web 2020-07-28 07:54:21 -04:00
Sajith Sasidharan
ca6cf887f7 Test JSON rendering synchronously 2020-07-28 07:26:11 -04:00
Sajith Sasidharan
1b7a35e773 Do not strip tags where it is not necessary 2020-07-28 07:18:57 -04:00
Sajith Sasidharan
e6867a1355 Use docstring to describe a class 2020-07-28 07:15:39 -04:00
Sajith Sasidharan
adca146a1b Use space as separator when removing tags 2020-07-28 07:10:44 -04:00
Sajith Sasidharan
80802a74cd Use BeautifulSoup to remove tags 2020-07-28 06:53:52 -04:00
Sajith Sasidharan
9f5c58c173 Use super() 2020-07-28 06:27:40 -04:00
Itamar Turner-Trauring
cbbe260a4e Windows doesn't like Unicode strings in os.environ in Python 2.7. 2020-07-27 16:19:36 -04:00
Itamar Turner-Trauring
94d489ff46 Fix trailing whitespace. 2020-07-27 16:01:12 -04:00
Itamar Turner-Trauring
79ae478a48 Port to Python 3. 2020-07-27 15:56:31 -04:00
Itamar Turner-Trauring
bde2f1394d Move dictutil tests out. 2020-07-27 15:53:26 -04:00
Itamar Turner-Trauring
2ca223a67c Port to Python 3. 2020-07-27 15:34:28 -04:00
Itamar Turner-Trauring
8d84be77d8 Port to Python 3. 2020-07-27 15:31:31 -04:00
Itamar Turner-Trauring
b140d1f1af Move statistics tests out. 2020-07-27 15:29:01 -04:00
Itamar Turner-Trauring
d8bf811b92 Native string all the things. 2020-07-27 15:20:35 -04:00
Itamar Turner-Trauring
74fe9ccf56 Foolscap expects a native string. 2020-07-27 15:16:34 -04:00
Itamar Turner-Trauring
ce8a575808 Test for specific ports. 2020-07-27 15:16:25 -04:00
Itamar Turner-Trauring
d91b4f0e40 Fix some tests and flake issues. 2020-07-27 15:12:09 -04:00
Itamar Turner-Trauring
361e75804c Merge remote-tracking branch 'origin/master' into 3356.iputil-python-3 2020-07-27 13:07:12 -04:00
Itamar Turner-Trauring
817355d17e Minimal testing for listenOnUnused. 2020-07-27 13:06:41 -04:00
Itamar Turner-Trauring
e681ca1cb9
Merge pull request #754 from tahoe-lafs/3357.version_checks-py3
Port version_checks to Python 3

Fixes ticket:3357
2020-07-27 12:36:28 -04:00
Itamar Turner-Trauring
9919d2c9a7 Record port status. 2020-07-27 11:46:03 -04:00
Itamar Turner-Trauring
436c2e77e4 Automated port to Python 3. 2020-07-27 11:44:58 -04:00
Itamar Turner-Trauring
fce7221481 Some steps to manually port to Python 3. 2020-07-27 11:42:20 -04:00
Itamar Turner-Trauring
1f34e62987 Port test module to Python 3. 2020-07-27 11:14:01 -04:00
Maciej Fijalkowski
13e292295e Revert "futurize and make the tests pass back under py2"
This reverts commit 361de05980.
2020-07-25 11:22:03 +02:00
Maciej Fijalkowski
361de05980 futurize and make the tests pass back under py2 2020-07-25 11:12:43 +02:00
Itamar Turner-Trauring
bf13401979 Move SignalMixin to common_py3.py. 2020-07-24 14:58:08 -04:00
Itamar Turner-Trauring
025afc1efe Merge branch '3357.version_checks-py3' into 3356.iputil-python-3 2020-07-24 14:50:50 -04:00
Itamar Turner-Trauring
11cd30c425 Merge remote-tracking branch 'origin/master' into 3357.version_checks-py3 2020-07-24 14:50:39 -04:00
Itamar Turner-Trauring
e80f138868 Fix indent. 2020-07-24 14:48:56 -04:00
Itamar Turner-Trauring
e0d3e46683 Merge remote-tracking branch 'origin/master' into 3351.spans-python-3 2020-07-24 14:48:33 -04:00
Itamar Turner-Trauring
4c6a9a5610 Merge branch '3357.version_checks-py3' into 3356.iputil-python-3 2020-07-24 14:36:31 -04:00
Itamar Turner-Trauring
337a4381bb Finish port to Python 3. 2020-07-24 14:31:36 -04:00
Itamar Turner-Trauring
65500de72f Merge remote-tracking branch 'origin/master' into 3346.abbreviate-and-time_format-py3 2020-07-24 14:13:28 -04:00
Itamar Turner-Trauring
f84d51d795 Port to Python 3. 2020-07-24 14:12:10 -04:00
Itamar Turner-Trauring
04db52b9e4 Some manual tweaks to be more likely to work with Python 3.
The Linux distribution porting code was obsolete (using Python APIs not present
in Python 3, /etc/lsb-release isn't a thing on Fedora 31, for example), so
replaced it with maintained third-party library.
2020-07-24 14:06:12 -04:00
Itamar Turner-Trauring
45a891114b Fix some things that prevent Python 3 imports. 2020-07-24 13:48:11 -04:00
Itamar Turner-Trauring
135ade02b1 Start porting. 2020-07-24 13:47:56 -04:00
Itamar Turner-Trauring
8bcd6dd34b
Merge branch 'master' into 3346.abbreviate-and-time_format-py3 2020-07-24 11:10:38 -04:00
Itamar Turner-Trauring
38648c0f8f
Fix indentation 2020-07-24 11:09:08 -04:00
Itamar Turner-Trauring
dd4737f20c
Merge branch 'master' into 3353.observer-and-pipeline-py3 2020-07-24 11:08:08 -04:00
Itamar Turner-Trauring
d23394b35c Merge remote-tracking branch 'origin/master' into 3346.abbreviate-and-time_format-py3 2020-07-23 12:27:06 -04:00
Itamar Turner-Trauring
ab4393b50e Document unicode. 2020-07-23 11:49:02 -04:00
Itamar Turner-Trauring
cab1b02ba2 Use constants, since we have them. 2020-07-23 11:47:12 -04:00
Itamar Turner-Trauring
b0083e342b Document being ported. 2020-07-23 11:47:06 -04:00
Itamar Turner-Trauring
eb688dfd7e Fix lint. 2020-07-22 13:22:50 -04:00
Itamar Turner-Trauring
64e4af2d05 Port to Python 3. 2020-07-22 13:17:49 -04:00
Itamar Turner-Trauring
15254d08fc A few more explicit byte strings. 2020-07-22 13:11:05 -04:00
Itamar Turner-Trauring
85c8ca6d77 Merge branch '3344.netstring-and-hashutil-to-python-3' into 3354.hashtree-to-python-3 2020-07-22 13:09:58 -04:00
Itamar Turner-Trauring
5129e1ef14 Explicitly mark bytestrings. 2020-07-22 13:08:24 -04:00
Itamar Turner-Trauring
e48aecfa1a Move parsing tests to better location, and fix them. 2020-07-22 12:55:16 -04:00
Itamar Turner-Trauring
0763f9f90b Port to Python 3. 2020-07-22 10:36:50 -04:00
Itamar Turner-Trauring
e427163ec8 Move pipeline tests into their own module. 2020-07-22 10:33:23 -04:00
Itamar Turner-Trauring
b4e6686211 Port to Python 3. 2020-07-22 10:29:44 -04:00
Itamar Turner-Trauring
2f608e8216 Merge remote-tracking branch 'origin/master' into 3346.abbreviate-and-time_format-py3 2020-07-22 10:11:27 -04:00
Itamar Turner-Trauring
51e9c2183c Add missing file. 2020-07-22 10:00:15 -04:00
Itamar Turner-Trauring
2391bd9733 Merge remote-tracking branch 'origin/master' into 3351.spans-python-3 2020-07-22 09:57:08 -04:00
Itamar Turner-Trauring
e9eb93468f Finish port to Python 3. 2020-07-22 09:56:59 -04:00
Itamar Turner-Trauring
3a8bafafc3 Merge remote-tracking branch 'origin/master' into 3344.netstring-and-hashutil-to-python-3 2020-07-22 09:36:34 -04:00
Itamar Turner-Trauring
ab24e9abb1 Manual porting to Python 3. 2020-07-21 15:14:52 -04:00
Itamar Turner-Trauring
d6f24af424 Move span tests into their own module. 2020-07-21 15:14:39 -04:00
Itamar Turner-Trauring
fa567841b5 Merge remote-tracking branch 'origin/master' into 3342-base32-and-base62-to-python-3 2020-07-21 14:40:33 -04:00
Itamar Turner-Trauring
6de05941b9 Remove unnecessary imports. 2020-07-21 14:27:08 -04:00
Itamar Turner-Trauring
4018b772a3 Port abbreviate.py. As far as I can tell, all division is already float division. 2020-07-21 14:15:39 -04:00
Itamar Turner-Trauring
116f232e80 Port time_format to Python 3. 2020-07-21 14:08:31 -04:00
Itamar Turner-Trauring
7e8de10ea3 Merge branch '3342-base32-and-base62-to-python-3' into 3344.netstring-and-hashutil-to-python-3 2020-07-21 14:00:53 -04:00
Itamar Turner-Trauring
c229ba7196 Workaround future/pypy incompatibility. 2020-07-21 13:55:53 -04:00
meejah
30a91a1106 public RSA exponent 17 -> 65537 2020-07-21 00:29:35 -06:00
Sajith Sasidharan
e145c7b00d
Merge pull request #722 from sajith/3254.status-status-nevow-to-twisted-web
Replace nevow with twisted.web.template in status.Status

Fixes: ticket:3254
2020-07-20 11:28:18 -04:00
Sajith Sasidharan
26ca9ae724
Merge pull request #726 from sajith/3313.operations-ophandle-table-nevow-to-twisted
Replace nevow with twisted.web in operations.OphandleTable

Fixes: ticket:3313
2020-07-19 08:14:32 -04:00
Sajith Sasidharan
c58cf56e83 Remove unused imports 2020-07-18 08:34:25 -04:00
Sajith Sasidharan
0f835e94f5 Merge 'origin/master' into 3254.status-status-nevow-to-twisted-web 2020-07-18 07:53:36 -04:00
Sajith Sasidharan
6dec821271
Merge pull request #720 from sajith/3288.status-download-nevow-to-twisted-web
Replace nevow with twisted.web.template in status.DownloadStatusPage

Fixes: ticket:3288
2020-07-18 07:22:37 -04:00
Sajith Sasidharan
879a8012a0 Remove unused import 2020-07-18 06:48:36 -04:00
Sajith Sasidharan
c198c006e3 Avoid over-long lines 2020-07-17 21:02:24 -04:00
Sajith Sasidharan
fe07ab39da Use docstrings 2020-07-17 16:22:23 -04:00
Sajith Sasidharan
c14197e1bc Make FakeDownloadStatus an instance of DownloadStatus
The real DownloadStatus is easy enough to instantiate.  Might as well
use that, cutting some crufty code here.
2020-07-17 16:13:07 -04:00
Sajith Sasidharan
293efd7c9f Use actual status counter number when testing 2020-07-17 13:50:06 -04:00
Sajith Sasidharan
8fd0cf7eb6 Add a test for checking status page links 2020-07-17 13:21:53 -04:00
Sajith Sasidharan
828ec53e24 Update status page test case
Link to upload status 0 should contain `/status/` prefix, or it will
navigate to `/up-0` instead of `/status/up-0`, resulting in a 404 not
found message.  Same with other statuses too.
2020-07-17 13:21:53 -04:00
Sajith Sasidharan
5c886b1b2d Format link to status page child node correctly
Some Nevow-ism accidentally escaped earlier: link to `/status/up-0`
and so on were actually rendered as `/up-0` and so on.
2020-07-17 13:21:53 -04:00
Sajith Sasidharan
2d19c383ca Rename a variable for clarity 2020-07-17 13:21:53 -04:00
Sajith Sasidharan
02d8bd061a Test for trailing slashes after /status/
Both `/status` and `/status/` are treated alike; any additional
trailing slashes will be rejected.
2020-07-17 13:21:53 -04:00
Sajith Sasidharan
372cc00a25 Reject non-existent child nodes of /status
Requests on both `/status` and `/status/` will be served with the same
status page, but `/status//`, `/status///` and so on will be processed
further down, resulting in a 40x response.
2020-07-17 09:46:21 -04:00
Sajith Sasidharan
fe165cc99d Do the right thing, not the simple thing
Seems that NixOS CI is saying that the simple thing is not the right
thing: "GET /status/down-0" etc all resulted in 404 responses on
NixOS.  So we perhaps should use the actual counter value.
2020-07-16 19:07:51 -04:00
Sajith Sasidharan
06c8bbfb19 Use clearer names for tests 2020-07-16 17:25:25 -04:00
Sajith Sasidharan
66dd2d3658 Use docstrings 2020-07-16 17:19:50 -04:00
Sajith Sasidharan
8db60e3486 Do the simple thing when testing status subpaths 2020-07-16 17:16:18 -04:00
Sajith Sasidharan
95642ae02c Use a helper to check status subpath results 2020-07-16 17:13:36 -04:00
Sajith Sasidharan
e48d930621 Clarify intention of a test case 2020-07-16 16:56:41 -04:00
Sajith Sasidharan
6a2ce9efc6 Use docstrings 2020-07-16 16:55:12 -04:00
Itamar Turner-Trauring
a4620bf176 Automated port of the test module. 2020-07-16 15:58:39 -04:00
Itamar Turner-Trauring
4c047b90e5 Manual steps of port to Python 3. 2020-07-16 15:46:23 -04:00
Itamar Turner-Trauring
e90d1f38d2 Make TimezoneMixin importable on Python 3. 2020-07-16 15:44:41 -04:00
Itamar Turner-Trauring
554be90b7e Unnecessary code, and was triggering flake8. 2020-07-16 15:27:36 -04:00
Itamar Turner-Trauring
72272cbf0b Move out tests for time_format. 2020-07-16 15:15:26 -04:00
Itamar Turner-Trauring
545848f164 Move abbreviate tests into their own module. 2020-07-16 14:57:09 -04:00
Itamar Turner-Trauring
4da8e2ddee Merge branch '3342-base32-and-base62-to-python-3' into 3344.netstring-and-hashutil-to-python-3 2020-07-16 14:42:09 -04:00
Itamar Turner-Trauring
8d143af43e Another assertion. 2020-07-16 14:40:30 -04:00
Itamar Turner-Trauring
2f693c47f9 Don't leak variable on Python 2. 2020-07-16 14:37:26 -04:00
Itamar Turner-Trauring
efbae9b3e3 Hard code some known values, generated on the master branch preceding these
changes.
2020-07-16 14:33:53 -04:00
Itamar Turner-Trauring
7abc54c429 Merge remote-tracking branch 'origin/master' into 3342-base32-and-base62-to-python-3 2020-07-16 14:21:42 -04:00
Jean-Paul Calderone
0ce6e562cb
Merge pull request #742 from chadwhitacre/3325.add-py36-to-ci
Add py36 to CI

Fixes: ticket:3325
2020-07-15 20:11:39 -04:00
Jean-Paul Calderone
c493396148
Merge pull request #740 from tahoe-lafs/3340-unused-code-in-util
Delete some dead code.

Fixes: ticket:3340
2020-07-15 20:08:41 -04:00
Sajith Sasidharan
80bf5f0a53 Remove an unused import 2020-07-15 19:19:51 -04:00
Sajith Sasidharan
7f93e28a7c Parameterize classes used in check/repair tests 2020-07-15 18:43:52 -04:00
Sajith Sasidharan
2d7095866a Expand "deep check and repair results" page test 2020-07-15 17:10:48 -04:00
Sajith Sasidharan
a13ec344b9 Correct usage of SlotsSequenceElement 2020-07-15 17:10:41 -04:00
Sajith Sasidharan
8fedbd52c2 Expand "deep check and repair" test 2020-07-15 16:58:39 -04:00
Sajith Sasidharan
6969366370 Document, use, and test "join pathstring" method 2020-07-15 16:40:05 -04:00
Sajith Sasidharan
589e143a4a Add an empty renderer 2020-07-15 16:24:11 -04:00
Sajith Sasidharan
e6eb866cef Add missing "header" renderer
It does not do much here, but it is good to be consistent
2020-07-15 16:21:46 -04:00
Sajith Sasidharan
b5a465cc8d Format "all objects" table correctly 2020-07-15 16:20:36 -04:00
Sajith Sasidharan
07c24dbe59 Add a missing super() call 2020-07-15 16:14:10 -04:00
Itamar Turner-Trauring
6af32fdfa7 Make sure the public API exposes native bytes, not Future bytes. 2020-07-15 15:59:46 -04:00
Itamar Turner-Trauring
ed6e1cb7ef Fix formatting. 2020-07-15 15:51:09 -04:00
Itamar Turner-Trauring
ed8b10c12f Finish porting to Python 3. 2020-07-15 15:00:29 -04:00
Itamar Turner-Trauring
4800992de6 Type check assertions. 2020-07-15 14:58:58 -04:00
Itamar Turner-Trauring
fa5b5fa436 Manual part of port to Python 3. 2020-07-15 14:55:56 -04:00
Sajith Sasidharan
69afd292c2 Use a different format for path
Seems that _join_pathstring() is the wrong thing to use here.
2020-07-15 13:43:50 -04:00
Sajith Sasidharan
3c079bef73 Expand "deep check results" test 2020-07-15 13:35:22 -04:00
Sajith Sasidharan
f547509332 Use table headers correctly 2020-07-15 13:24:32 -04:00
Sajith Sasidharan
ddfe20c8ab Use SlotsSequenceElement correctly 2020-07-15 13:24:20 -04:00
Itamar Turner-Trauring
bb7d31c5e4 Futurize part of port to Python 3. 2020-07-15 11:19:57 -04:00
Itamar Turner-Trauring
60a1a24423 Manual portion of port to Python 3. 2020-07-15 11:13:59 -04:00
Itamar Turner-Trauring
e3e29598e4 A couple of missing explicit byte strings. 2020-07-15 11:13:52 -04:00
Itamar Turner-Trauring
cfb11f7f4c More explicit testing of types. 2020-07-15 11:08:06 -04:00
Itamar Turner-Trauring
093125ca43 Port to Python 3. 2020-07-15 11:05:23 -04:00
Itamar Turner-Trauring
d316ad3ebd A more explicit test. 2020-07-15 11:02:49 -04:00
Itamar Turner-Trauring
2b89674052 Everything must be bytes. 2020-07-15 11:01:45 -04:00
Itamar Turner-Trauring
9ed91eabb3 Split out hashutil tests into their own module. 2020-07-15 10:58:05 -04:00
Sajith Sasidharan
1ed722494c Add a FakeServer class for testing 2020-07-15 10:35:56 -04:00
Sajith Sasidharan
6322404b1e Update "deep check results renderer" test 2020-07-14 21:44:41 -04:00
Sajith Sasidharan
99ce9ff198 Correct argument to SlotsSequenceElement 2020-07-14 21:42:28 -04:00
Sajith Sasidharan
ef26d66e79 Use correct twisted web template directives 2020-07-14 20:50:12 -04:00
Sajith Sasidharan
b4b820ed7b Use a helper method to get monitor counter 2020-07-14 20:47:23 -04:00
Itamar Turner-Trauring
3688291df2 Handy way to run Python 3 tests, until the ratchet is going. 2020-07-14 13:53:26 -04:00
Itamar Turner-Trauring
5fd01523cf This module is not a thing. 2020-07-14 13:53:13 -04:00
Itamar Turner-Trauring
21a9ffef7a Not strings. 2020-07-14 13:46:12 -04:00
Itamar Turner-Trauring
a81e859b82 Fix flake error. 2020-07-14 13:44:56 -04:00
Itamar Turner-Trauring
27d8eb47fc Test improvements. 2020-07-14 13:44:00 -04:00
Itamar Turner-Trauring
db41d5af6f
Merge pull request #743 from tahoe-lafs/3342-more-tests-for-base32-base62
Fixes https://tahoe-lafs.org/trac/tahoe-lafs/ticket/3343
2020-07-14 13:41:20 -04:00
Itamar Turner-Trauring
e0adb3b37d Port to Python 3. 2020-07-14 13:35:46 -04:00
Itamar Turner-Trauring
b5db85afbe Initial, manual steps of Python 3 port. 2020-07-14 11:53:40 -04:00
Itamar Turner-Trauring
3abb9e9db4 Rip out a whole bunch of code, either deleting or replacing with stdlib's base32 implementation. 2020-07-14 11:45:05 -04:00
Itamar Turner-Trauring
f3db64ad74 Port to Python 3. 2020-07-14 11:29:09 -04:00
Itamar Turner-Trauring
ab3737d686 Note this module has been ported to Python 3. 2020-07-14 11:28:51 -04:00
Itamar Turner-Trauring
9c428be0e2 Port base62 to Python 3. 2020-07-14 11:24:45 -04:00
Itamar Turner-Trauring
b1e732fb9a Port test_base62 to Python 3. 2020-07-14 10:34:53 -04:00
Itamar Turner-Trauring
e34a01d547 A couple more asserts. 2020-07-14 10:28:22 -04:00
Itamar Turner-Trauring
459d68118c Merge branch '3342-more-tests-for-base32-base62' into 3342-base32-and-base62-to-python-3 2020-07-14 10:26:46 -04:00
Itamar Turner-Trauring
f378edd9d8 Fix missing import. 2020-07-14 10:20:51 -04:00
Sajith Sasidharan
54e952ceda Test for 404 responses from status page subpaths 2020-07-14 09:01:31 -04:00
Chad Whitacre
329bfe05f9 Make a crucial relative import explicit 2020-07-13 22:27:59 -04:00
Sajith Sasidharan
abd539588f Rename nested functions for clarity
... and also to remove embarrassing copy-pasta mistakes.
2020-07-13 20:52:12 -04:00
Sajith Sasidharan
b48556c2cb Add tests for status subpages
Coverage tests for the coverage gods
2020-07-13 20:44:30 -04:00
Itamar Turner-Trauring
ead2a79cf7 Everything should be bytes. 2020-07-13 16:21:15 -04:00
Itamar Turner-Trauring
6464e226c6 Hypothesis-based roundtrip test. 2020-07-13 16:19:48 -04:00
Itamar Turner-Trauring
828e6bc28a Minimal tests for could_be_base32_encoded(). 2020-07-13 16:18:13 -04:00
Itamar Turner-Trauring
77ae087c77 Remove a2b_l and b2a_l from public API, to ease likely future switch to stdlib
base64's implementation.
2020-07-13 16:12:53 -04:00
Itamar Turner-Trauring
e23dbcdf56 Document current public API. 2020-07-13 15:41:01 -04:00
Itamar Turner-Trauring
bbfd39e6c0 Test larger variety of inputs using hypothesis. 2020-07-13 15:30:11 -04:00
Itamar Turner-Trauring
a8a7d48c12 Everything must be bytes. 2020-07-13 15:25:07 -04:00
Itamar Turner-Trauring
f27cba181e Move existing base32 tests out of test_util.py. 2020-07-13 15:22:03 -04:00
Itamar Turner-Trauring
1a3a1ffcaa Restore eliot code. 2020-07-13 14:33:13 -04:00
Itamar Turner-Trauring
af916c3968
Merge branch 'master' into 3341-more-python-3-utils 2020-07-13 14:30:11 -04:00
Sajith Sasidharan
144001f380 Use a better assert in status subpath test 2020-07-11 08:30:39 -04:00
Sajith Sasidharan
6eba2fb2e6 Test "deep check results" page
These are some basic tests -- let's see if this improves test
coverage, and by how much.
2020-07-11 07:59:28 -04:00
Sajith Sasidharan
b49a3eaf3a Check for a non-standard property on request 2020-07-10 21:46:23 -04:00