Commit Graph

5578 Commits

Author SHA1 Message Date
meejah
8965c77d63 look for correct error-string 2020-05-04 21:59:15 -06:00
meejah
4c3d0ea6cc use 'with open' for more file-opens 2020-05-04 21:59:15 -06:00
meejah
9bcc465f76 unused import 2020-05-04 21:59:15 -06:00
meejah
4928d62d66 use set instead of WeakKeyDictionary 2020-05-04 21:59:15 -06:00
meejah
5175a6c6a0 asserts for systemexit 2020-05-04 21:59:15 -06:00
meejah
5071ddf124 add more 'with' statements 2020-05-04 21:59:15 -06:00
meejah
a348d3d507 relying on memory/gc bad 2020-05-04 21:59:15 -06:00
meejah
ca5e1ebe52 look at correct mock-call object 2020-05-04 21:59:15 -06:00
meejah
4b0c730adf use 'with open' correctly 2020-05-04 21:59:15 -06:00
Sajith Sasidharan
7d063995f5 Update copyright years 2020-05-04 15:35:21 -04:00
Sajith Sasidharan
4ebd6250e3 Document root.Root 2020-05-04 14:20:05 -04:00
Sajith Sasidharan
96449bb99b Ensure lists before conversion to dict 2020-05-04 14:05:33 -04:00
Sajith Sasidharan
88b369a0c2 Remove unused variables 2020-05-04 11:48:52 -04:00
Sajith Sasidharan
bf0f8a736a Remove unused imports 2020-05-04 11:48:41 -04:00
Sajith Sasidharan
58a06cb57d Update test that exercises empty nick and version 2020-05-04 09:45:36 -04:00
Sajith Sasidharan
df9b160a3c Mark describe server method as static 2020-05-01 17:42:46 -04:00
Sajith Sasidharan
80a26e26b1 Refactor methods that describe server/connection 2020-05-01 17:41:51 -04:00
Sajith Sasidharan
7b4d81fe28 Rename root.Root variables 2020-05-01 17:38:24 -04:00
Sajith Sasidharan
ade7f613b8 Remove unused renderer 2020-05-01 17:07:08 -04:00
Sajith Sasidharan
df188c75df Wrap footer elements in tags 2020-05-01 16:50:30 -04:00
Sajith Sasidharan
029c99a241 Render introducers table using SlotsSequenceElement 2020-05-01 16:45:34 -04:00
Sajith Sasidharan
1ddf07d59d Render services table using SlotsSequenceElement 2020-05-01 16:45:04 -04:00
Sajith Sasidharan
0d8eda5e76 Rearrange imports 2020-05-01 16:07:30 -04:00
Sajith Sasidharan
053e614221 Import resource_filename from setuptools
Drop the nevow one
2020-05-01 16:07:21 -04:00
Sajith Sasidharan
e9796eb308 Match against root path first 2020-04-30 18:49:05 -04:00
Sajith Sasidharan
cfe4b2925e Remove an unused method and imports 2020-04-30 18:48:06 -04:00
Sajith Sasidharan
cce6f83054 Remove unused renderers 2020-04-30 18:47:13 -04:00
Sajith Sasidharan
88b7784f39 Use BeautifulSoup in test.test_system.SystemTest.test_filesystem 2020-04-30 15:09:10 -04:00
Sajith Sasidharan
6aebab28a9 Use BeautifulSoup to check rendered document 2020-04-30 10:17:48 -04:00
Sajith Sasidharan
80ba700247 Correct usage of fillSlots 2020-04-29 12:18:39 -04:00
Sajith Sasidharan
e5733b6c90 Remove unused test code 2020-04-28 19:09:00 -04:00
Sajith Sasidharan
98322effe6 Update test to exercise services renderer 2020-04-28 19:07:57 -04:00
Sajith Sasidharan
a885f14c43 Pass now_fn to RootElement 2020-04-28 11:47:18 -04:00
Sajith Sasidharan
8ce1512501 Render import path 2020-04-28 07:57:15 -04:00
Sajith Sasidharan
32e0c779b6 Add version renderer 2020-04-28 07:56:27 -04:00
Sajith Sasidharan
d064f6b2b7 Add "rendered at" renderer 2020-04-28 07:55:10 -04:00
Sajith Sasidharan
ed6970b168 Correct fill slots usage in connection status 2020-04-28 07:52:57 -04:00
Sajith Sasidharan
5d84a25f21 Add introducers row renderer 2020-04-28 07:50:03 -04:00
Sajith Sasidharan
5155befedc Rewrite total introducers 2020-04-28 07:48:28 -04:00
Sajith Sasidharan
44f16e77cf Add introducers renderer 2020-04-28 07:47:36 -04:00
Sajith Sasidharan
7ba4b945a4 Use introducers renderer method in root template 2020-04-28 07:43:41 -04:00
Sajith Sasidharan
8d4949f96b Render total introducers correctly 2020-04-28 07:42:57 -04:00
Sajith Sasidharan
a646c7decd Fix typo 2020-04-28 07:42:07 -04:00
Sajith Sasidharan
89980a039c Render total introducers 2020-04-28 07:41:29 -04:00
Sajith Sasidharan
2f53b2a67d Add connected introducers renderer 2020-04-28 07:17:22 -04:00
Sajith Sasidharan
164218cf57 Update service table renderer 2020-04-28 07:14:35 -04:00
Sajith Sasidharan
907e8ccf6b Use services renderer method in root template 2020-04-28 07:13:41 -04:00
Sajith Sasidharan
75d41843d7 Use transparent nodes 2020-04-28 04:59:46 -04:00
Sajith Sasidharan
3c4056a947 Replace nevow.static.File with twisted.web.static.File 2020-04-28 04:47:48 -04:00
Sajith Sasidharan
dcea7ea476 Render connected/known storage server status 2020-04-27 17:22:27 -04:00
Sajith Sasidharan
1713076a9d Render services 2020-04-27 17:19:19 -04:00
Sajith Sasidharan
39d616a971 Render helper furl prefix 2020-04-27 17:11:36 -04:00
Sajith Sasidharan
8b4c7296d7 Move helper state to a separate function 2020-04-27 17:07:09 -04:00
Sajith Sasidharan
332bd75fcc Render helper description 2020-04-27 17:03:52 -04:00
Sajith Sasidharan
622d156278 Render "connected to helpers" status 2020-04-27 17:01:37 -04:00
Sajith Sasidharan
a4f86181f9 Render introducer description 2020-04-27 16:55:10 -04:00
Sajith Sasidharan
c86d4341c8 Render "connected to introducers" status 2020-04-27 16:52:54 -04:00
Sajith Sasidharan
65b6daf990 Rewrite incident button using twisted tags 2020-04-27 16:44:06 -04:00
Sajith Sasidharan
110528f569 Handle path "/" when rendering root path 2020-04-27 16:44:06 -04:00
Sajith Sasidharan
f34cdb81ad Create RootElement 2020-04-27 16:44:06 -04:00
Sajith Sasidharan
1c17bb0674 Rewrite welcome page for twisted.web.template 2020-04-27 16:24:50 -04:00
Sajith Sasidharan
e2c6d288bf
Merge pull request #699 from sajith/3294.incident-reporter-to-nevow
Remove nevow from allmydata.web.root.IncidentReporter
2020-04-27 10:12:27 -04:00
Sajith Sasidharan
f02501eadf Update comment on HelperStatus 2020-04-24 10:08:45 -04:00
meejah
c385e958a8 Merge branch 'master' into ticket3252-port-web-directory.remaining.1 2020-04-23 12:24:00 -06:00
Sajith Sasidharan
18d5d3fc49 Wrap rendered nodes in tags 2020-04-22 18:23:43 -04:00
Sajith Sasidharan
65315c4ed0 Render a message when helper isn't running 2020-04-22 17:16:33 -04:00
Sajith Sasidharan
6661b52c33 Reformat helper.xhtml 2020-04-22 17:06:59 -04:00
Sajith Sasidharan
aafe89805d Document helper stats data format 2020-04-22 17:06:39 -04:00
Sajith Sasidharan
4bc7535d02 Derive HelperStatus from MultiFormatResource 2020-04-22 16:54:11 -04:00
Sajith Sasidharan
d844a8f89f Use twisted transparent tag to render data
This way the test suite will be happy, and we won't have extraneous
`<div>` tags in the rendered page.
2020-04-21 11:53:48 -04:00
Sajith Sasidharan
a0eb00b2cc Wrap renderer return values in tags 2020-04-21 11:53:48 -04:00
Sajith Sasidharan
1e3ba25cc3 Add some documentation to Statistics page 2020-04-21 11:53:48 -04:00
Sajith Sasidharan
652b3f5bc0 Use twisted.web.template to render Statistics page 2020-04-21 11:53:48 -04:00
Sajith Sasidharan
b3feaae644 Use an inner JSONRequest class with renderJSON
Once nevow is removed from web/common.py, we can simplify
renderJSON(), like so:

  def renderJSON():
      req = Request()
      req.args = {"t": ["json"]}
      req.fields = {}
      return resource.render(req)

But for now we have to live with an inner class that implements the
nevow.inevow.IRequest interface.
2020-04-21 10:29:28 -04:00
Sajith Sasidharan
201c08dbe5 Declare JSON request interface using @implementer
"zope.interface.implements(IRequest)" is deprectated in favor of
"@zope.interface.implementer(IRequest)" decorator.
2020-04-20 16:54:51 -04:00
meejah
8df1ed1ba6 link to tickets 2020-04-18 02:49:14 -06:00
meejah
f8a78c996a URL -> DecodedURL 2020-04-18 02:27:32 -06:00
meejah
73d0151e1b typo 2020-04-18 01:52:31 -06:00
meejah
349aefeacc fail() takes a message, not Exception 2020-04-18 01:52:18 -06:00
meejah
018e161f19 don't allow trailing slashes
This makes /uri/xxx URIs invalid if they have a trailing slash.
It seems that the former Nevow implementation would allow this, and
some tests (and, notable, "tahoe backup") did rely on using URIs
of this style.
2020-04-18 01:52:18 -06:00
meejah
882c63dab9 methods shouldn't be named like classes 2020-04-18 01:52:18 -06:00
meejah
0acf0d2a7e no addslash here 2020-04-18 01:52:18 -06:00
meejah
bc2f5f8e88 functions shouldn't be named like classes 2020-04-18 01:52:18 -06:00
meejah
8f35f78194 temporary fix for hypothesis test 2020-04-18 01:52:18 -06:00
meejah
c246b3e049 self.assertEqual not assert 2020-04-18 01:52:18 -06:00
meejah
701915783c make unpack/pack test use Hypothesis 2020-04-18 01:52:18 -06:00
meejah
6ea6abdb1f no .format yet 2020-04-18 01:52:18 -06:00
meejah
fc4aec7b77 remove comment 2020-04-18 01:52:18 -06:00
meejah
2e9463bd08 compute 'is this a terminal request' differently 2020-04-18 01:52:18 -06:00
meejah
b0c138f7c0 remove empty segments instead of making multiple URI's valid 2020-04-18 01:52:18 -06:00
meejah
8c47b8e2a1 don't need object 2020-04-18 01:52:18 -06:00
meejah
088fcff442 better formatting 2020-04-18 01:52:18 -06:00
meejah
c6f4f0b7d5 betterize comment 2020-04-18 01:52:18 -06:00
meejah
8db16ff8e3 old-style class 2020-04-18 01:52:18 -06:00
meejah
b64f90bcd4 simplify 2020-04-18 01:52:18 -06:00
meejah
95e5029c34 more comment 2020-04-18 01:52:18 -06:00
meejah
d425baed89 remove irrelevant comment 2020-04-18 01:52:18 -06:00
meejah
3c332fec2a empty-string, not None 2020-04-18 01:52:18 -06:00
meejah
733b7932ce clarify further; remove unused user of RenderMixin 2020-04-18 01:52:18 -06:00
meejah
ace99a1724 add clarifying comment 2020-04-18 01:52:18 -06:00
meejah
f9e3fdfaee use % instead of format 2020-04-18 01:52:18 -06:00
meejah
3d3feec059 encode for fail() / Exception 2020-04-18 01:52:18 -06:00
meejah
d533becc07 native strings only 2020-04-18 01:52:18 -06:00
meejah
ef5e18b6c7 unused 2020-04-18 01:52:18 -06:00
meejah
fdb3399edb just delete test_welcome 2020-04-18 01:52:18 -06:00
meejah
b44980ca01 get rid of assert_ 2020-04-18 01:52:18 -06:00
meejah
e4d556b49e assert about connected storage servers 2020-04-18 01:52:18 -06:00
meejah
f9956f4c43 remove asserts for static text 2020-04-18 01:52:18 -06:00
meejah
355c78f0d4 irrelevant comment 2020-04-18 01:52:18 -06:00
meejah
9ccbe562d7 add break 2020-04-18 01:52:18 -06:00
meejah
d12fd573d3 assert for noreferrer 2020-04-18 01:52:18 -06:00
meejah
48f859f5d4 document internal callback 2020-04-18 01:52:18 -06:00
meejah
98d8c52916 comment 2020-04-18 01:52:18 -06:00
meejah
db7939f766 irrelevant comment 2020-04-18 01:52:18 -06:00
meejah
b81589ca22 irrelevant comment 2020-04-18 01:52:18 -06:00
meejah
965fadb0df irrelevant comment 2020-04-18 01:52:18 -06:00
meejah
956d67b9b8 irrelevant comment 2020-04-18 01:52:17 -06:00
meejah
685aaf14bf soup, not re 2020-04-18 01:52:17 -06:00
meejah
af35483fbf soup not re 2020-04-18 01:52:17 -06:00
meejah
b71d4993c6 more soup 2020-04-18 01:52:17 -06:00
meejah
b4fab4403f use soup, not strings 2020-04-18 01:52:17 -06:00
meejah
bd1cbde273 re/string checks -> soup 2020-04-18 01:52:17 -06:00
meejah
76516fe02e use soup, not re 2020-04-18 01:52:17 -06:00
meejah
c489c61404 refactor 2020-04-18 01:52:17 -06:00
meejah
d5ef65d326 beautifulsoup, not re 2020-04-18 01:52:17 -06:00
meejah
65ec212779 unused imports 2020-04-18 01:52:17 -06:00
meejah
757bcc5309 cleanup 2020-04-18 01:52:17 -06:00
meejah
bf3c71c35f change not required 2020-04-18 01:52:17 -06:00
meejah
178c45eb0d remove print 2020-04-18 01:52:17 -06:00
meejah
203066e8fd better error-code 2020-04-18 01:52:17 -06:00
meejah
9732955eba spelling 2020-04-18 01:52:17 -06:00
meejah
25096715fb flake8 2020-04-18 01:52:17 -06:00
meejah
74ce166463 use twisted-web APIs, not nevow 2020-04-18 01:52:17 -06:00
meejah
044d1cfbea correct error 2020-04-18 01:52:17 -06:00
meejah
6415873f0b undo change 2020-04-18 01:52:17 -06:00
meejah
d0c47fe1d1 irrelevant comment 2020-04-18 01:52:17 -06:00
meejah
97a3f61c28 irrelevant comment 2020-04-18 01:52:17 -06:00
meejah
bc04c9b3db detech empty pathname components, hopefully the same way as Nevow 2020-04-18 01:52:17 -06:00
meejah
83a70bb6f3 some fixes 2020-04-18 01:52:17 -06:00
meejah
d26ce3beb0 some things that fail, but not in quite the right way .. for reasons 2020-04-18 01:52:17 -06:00
meejah
8268f764aa quote output, render GET 2020-04-18 01:52:17 -06:00
meejah
e894795898 redirects don't have to be absolute 2020-04-18 01:52:17 -06:00
meejah
45bfe743d4 improve comment wording 2020-04-18 01:52:17 -06:00
meejah
c4f49bb377 children must be None on error 2020-04-18 01:52:17 -06:00
meejah
543a948d32 shadowed test name; reveal both tests 2020-04-18 01:52:17 -06:00
meejah
98005bab1f addSlash isn't a thing in twisted.web 2020-04-18 01:52:17 -06:00
meejah
a29f1bec9d doubly-quoted 2020-04-18 01:52:17 -06:00
meejah
800b69047c the error-message changed 2020-04-18 01:52:17 -06:00
meejah
effaa6500c filename goes in the dict 2020-04-18 01:52:17 -06:00
meejah
19baba226a Resource needs to be new-style 2020-04-18 01:52:17 -06:00
meejah
dc4669b5e7 fix name decoding 2020-04-18 01:52:17 -06:00
meejah
66f392f7d0 remove debug 2020-04-18 01:52:17 -06:00
meejah
410f0133ab correctly register top-level directory node page 2020-04-18 01:52:17 -06:00
meejah
921926239a Revert "fix getchild for directory"
This reverts commit 8f00f4d4ab2e7edd0ad60a6144e858ece4a4be1f.
2020-04-18 01:52:17 -06:00
meejah
247fc54f8c explicit pack/unpack test 2020-04-18 01:52:17 -06:00
meejah
b4d9bfea15 fix deep-stats results 2020-04-18 01:52:17 -06:00
meejah
7a36bdc523 delete 'move to different dir' because it also doesn't work on trunk 2020-04-18 01:52:17 -06:00
meejah
e2304326fd fix rename-form 2020-04-18 01:52:17 -06:00
meejah
d12078abe2 fix form 2020-04-18 01:52:17 -06:00
meejah
8b7e1c30ab remove debug 2020-04-18 01:52:17 -06:00
meejah
d381d3e92b better style 2020-04-18 01:52:17 -06:00
meejah
f4c8eb5e2f not required 2020-04-18 01:52:17 -06:00
meejah
71c97369f0 fix getchild for directory 2020-04-18 01:52:17 -06:00
meejah
8f32936c7a /file works 2020-04-18 01:52:17 -06:00
meejah
c2ff7e260b more ctx -> req 2020-04-18 01:52:17 -06:00
meejah
79c3f919ba cleanup 2020-04-18 01:52:17 -06:00
meejah
b51f144f87 another thing works 2020-04-18 01:52:17 -06:00
meejah
66c0c71a0d a thing works 2020-04-18 01:52:17 -06:00
meejah
ace73a9215 whitespace 2020-04-18 01:52:17 -06:00
meejah
9e0e25cbed WIP FIXME porting directory, need child_ refactor thing 2020-04-18 01:52:17 -06:00
meejah
fd4d2709a5 search-replace "n:" -> "t:" 2020-04-18 01:52:17 -06:00
Sajith Sasidharan
15131a9f71 Handle just POST requests in IncidentReporter 2020-04-17 15:44:39 -04:00
Sajith Sasidharan
a14cee5cce Remove nevow from allmydata.web.root.IncidentReporter
This change calls for an explanation:

- `RenderMixin` doesn't seem to be adding anything here, so it is
   gone.

- The web browser was unhappy without a charset in the response
  (Firefox 74 was anyway), so `content-type` header also gets a
  `charset=UTF-8`.

- Returning a Unicode string made nevow appserver unhappy, so it is
  just a `str`.  The precise error message was:

  exceptions.TypeError: ('Could not adapt', u'An incident report has been saved to logs/incidents/ in the node directory.', <InterfaceClass nevow.inevow.IResource>)

Fixes: ticket:3294
2020-04-17 15:44:39 -04:00
Sajith Sasidharan
82cd5a87fe Use DummyRequest in storage tests
Using twisted.web.server.Request causes test_new_style_classes to
fail like so:

  Traceback (most recent call last):
  Failure: testtools.testresult.real._StringException: Traceback (most recent call last):
    File ".tox/coverage/lib/python2.7/site-packages/allmydata/test/test_python2_regressions.py", line 69, in test_new_style_classes
      "Expected to find no classic classes.",
    File ".tox/coverage/lib/python2.7/site-packages/testtools/testcase.py", line 502, in assertThat
      raise mismatch_error
  testtools.matchers._impl.MismatchError: !=:
  reference = set([])
  actual    = set([<class allmydata.test.test_storage.JSONRequest at 0x7fd938040bb0>])
  : Expected to find no classic classes.

Seems that `DummyRequest` is an acceptable new style class.
2020-04-17 15:25:42 -04:00
Sajith Sasidharan
b2b7061980 Refactor storage test helpers
Rewrite `renderSynchronously()` to use `renderDeferred()`
2020-04-17 15:25:42 -04:00
Sajith Sasidharan
72b8f72080 Add docstrings to storage test helpers 2020-04-17 15:25:42 -04:00
Sajith Sasidharan
8b7ef33b3d Remove redundant render_json() method 2020-04-17 15:25:42 -04:00
Sajith Sasidharan
3e7dea7dda Wrap renderer results in tags 2020-04-17 15:25:42 -04:00
Sajith Sasidharan
8c92187d92 Avoid using nevow FakeRequest in storage test.
Use twisted.web.server.Request instead, with a DummyChannel.

There's still one line of inevitable nevow now, because of code in
web/common.py; but that should be easily replaceable once we switch
that over.
2020-04-17 15:25:42 -04:00
Sajith Sasidharan
9c7357bc61 Remove an extraneous directive
`t:data` is not really a Twisted template directive.  Added my
mistake, removing now.
2020-04-17 15:25:42 -04:00
Sajith Sasidharan
bae32179bf Remove StorageStatus.renderHTTP
This was added to please the test suite. Pleased to remove it!
2020-04-17 15:25:42 -04:00
Sajith Sasidharan
f1fe3a7588 Get rid of WebRenderingMixin in storage test 2020-04-17 15:25:42 -04:00
Sajith Sasidharan
110734daf0 Use a helper to exercise render() in storage test cases 2020-04-17 15:25:42 -04:00
Sajith Sasidharan
554c477cea Prefix member variable with "_" 2020-04-17 15:25:42 -04:00
Sajith Sasidharan
6c3256517a Use slots to render storage stats table 2020-04-17 15:25:42 -04:00
Sajith Sasidharan
0cbe2871fd Give the suite the precise string it wants 2020-04-17 15:25:42 -04:00
Sajith Sasidharan
ff019e5b12 Use BeautifulSoup to check favicon in storage page 2020-04-17 15:25:42 -04:00
Sajith Sasidharan
7625d959bc Use <t:transparent> to render node nickname and id
CI did not like the old way, but it passed in my system.  Odd.
2020-04-17 15:25:42 -04:00
Sajith Sasidharan
36a486426e Mark format_recovered as static method 2020-04-17 15:25:42 -04:00
Sajith Sasidharan
0382b1ec63 Use Unicode strings to render space 2020-04-17 15:25:42 -04:00
Sajith Sasidharan
aab940f65f Remove redundant None-checks on self.storage
When no storage is up, `storage_running()` renderer will return a big
honking `no storage server running` message, and no further renderers
will be invoked.  Therefore the extra defense is probably not
required.

(I tested this hypothesis.  The extra defense is not required, unless
there's something I have not seen.)
2020-04-17 15:25:42 -04:00
Sajith Sasidharan
c061f6830e Use successResultOf in renderSynchronously
Get rid of [].append trick when dealing with the deferred.
2020-04-17 15:25:42 -04:00
Sajith Sasidharan
e2fc1fc07e Move renderSynchronously to test suite 2020-04-17 15:25:42 -04:00
Sajith Sasidharan
7a053ddeff Use explicit None-check on self.storage 2020-04-17 15:25:42 -04:00
Sajith Sasidharan
9b51bdf7fa Return result from renderHTTP
Bogus renderHTTP, but test failures are now down to three. We just
need to handle requests for JSON now.
2020-04-17 15:25:42 -04:00
Sajith Sasidharan
6e9a4e30d7 Add a docstring 2020-04-17 15:25:42 -04:00
Sajith Sasidharan
f22417e51b Rename function for clarity 2020-04-17 15:25:42 -04:00
Sajith Sasidharan
227d06fe64 Add docstrings to StorageStatusElement 2020-04-17 15:25:42 -04:00
Sajith Sasidharan
d3ff578640 Use parentheses in test suite's import statement 2020-04-17 15:25:42 -04:00
Sajith Sasidharan
b1c78244ab Use parentheses in import statement 2020-04-17 15:25:42 -04:00