mirror of
https://github.com/tahoe-lafs/tahoe-lafs.git
synced 2025-02-01 00:45:52 +00:00
use soup, not re
This commit is contained in:
meejah
parent
c489c61404
commit
76516fe02e
@ -26,10 +26,42 @@ def assert_soup_has_tag_with_attributes(testcase, soup, tag_name, attrs):
|
|||||||
"""
|
"""
|
||||||
tags = soup.find_all(tag_name)
|
tags = soup.find_all(tag_name)
|
||||||
for tag in tags:
|
for tag in tags:
|
||||||
if all(tag.attrs[k] == v for k, v in attrs.items()):
|
if all(v in tag.attrs.get(k, []) for k, v in attrs.items()):
|
||||||
return # we found every attr in this tag; done
|
return # we found every attr in this tag; done
|
||||||
|
# seems like exceptions can't support unicode text in python2??
|
||||||
testcase.fail(
|
testcase.fail(
|
||||||
"No <{}> tags contain attributes: {}".format(tag_name, attrs)
|
u"No <{}> tags contain attributes: {}".format(tag_name, attrs).encode("utf8")
|
||||||
|
)
|
||||||
|
|
||||||
|
|
||||||
|
def assert_soup_has_tag_with_attributes_and_content(testcase, soup, tag_name, content, attrs):
|
||||||
|
"""
|
||||||
|
Using a ``TestCase`` object ``testcase``, assert that the passed
|
||||||
|
in ``BeatufulSoup`` object ``soup`` contains a tag ``tag_name``
|
||||||
|
(unicode) which has all the attributes in ``attrs`` (dict) and
|
||||||
|
contains the string ``content`` (unicode).
|
||||||
|
"""
|
||||||
|
assert_soup_has_tag_with_attributes(testcase, soup, tag_name, attrs)
|
||||||
|
assert_soup_has_tag_with_content(testcase, soup, tag_name, content)
|
||||||
|
|
||||||
|
|
||||||
|
def assert_soup_has_tag_with_content(testcase, soup, tag_name, content):
|
||||||
|
"""
|
||||||
|
Using a ``TestCase`` object ``testcase``, assert that the passed
|
||||||
|
in ``BeatufulSoup`` object ``soup`` contains a tag ``tag_name``
|
||||||
|
(unicode) which contains the string ``content`` (unicode).
|
||||||
|
"""
|
||||||
|
tags = soup.find_all(tag_name)
|
||||||
|
for tag in tags:
|
||||||
|
if content in tag.contents:
|
||||||
|
return
|
||||||
|
# make this a "fuzzy" option?
|
||||||
|
for c in tag.contents:
|
||||||
|
if content in c:
|
||||||
|
return
|
||||||
|
# seems like exceptions can't support unicode text in python2??
|
||||||
|
testcase.fail(
|
||||||
|
u"No <{}> tag contains the text '{}'".format(tag_name, content).encode('utf8')
|
||||||
)
|
)
|
||||||
|
|
||||||
|
|
||||||
|
|||||||
@ -55,7 +55,10 @@ from .common import (
|
|||||||
assert_soup_has_favicon,
|
assert_soup_has_favicon,
|
||||||
assert_soup_has_text,
|
assert_soup_has_text,
|
||||||
assert_soup_has_tag_with_attributes,
|
assert_soup_has_tag_with_attributes,
|
||||||
|
assert_soup_has_tag_with_content,
|
||||||
|
assert_soup_has_tag_with_attributes_and_content,
|
||||||
)
|
)
|
||||||
|
|
||||||
from allmydata.interfaces import IMutableFileNode, SDMF_VERSION, MDMF_VERSION
|
from allmydata.interfaces import IMutableFileNode, SDMF_VERSION, MDMF_VERSION
|
||||||
from allmydata.mutable import servermap, publish, retrieve
|
from allmydata.mutable import servermap, publish, retrieve
|
||||||
from .. import common_util as testutil
|
from .. import common_util as testutil
|
||||||
@ -842,63 +845,95 @@ class Web(WebMixin, WebErrorMixin, testutil.StallMixin, testutil.ReallyEqualMixi
|
|||||||
d.addCallback(_check)
|
d.addCallback(_check)
|
||||||
return d
|
return d
|
||||||
|
|
||||||
|
@inlineCallbacks
|
||||||
def test_welcome(self):
|
def test_welcome(self):
|
||||||
d = self.GET("/")
|
data = yield self.GET("/")
|
||||||
def _check(res):
|
soup = BeautifulSoup(data, 'html5lib')
|
||||||
# TODO: replace this with a parser
|
assert_soup_has_favicon(self, soup)
|
||||||
self.failUnlessIn('<title>Tahoe-LAFS - Welcome</title>', res)
|
assert_soup_has_tag_with_content(self, soup, u"title", u"Tahoe-LAFS - Welcome")
|
||||||
self.failUnlessIn(FAVICON_MARKUP, res)
|
assert_soup_has_tag_with_attributes_and_content(
|
||||||
self.failUnlessIn('<a href="status">Recent and Active Operations</a>', res)
|
self, soup, u"a",
|
||||||
self.failUnlessIn('<a href="statistics">Operational Statistics</a>', res)
|
u"Recent and Active Operations",
|
||||||
self.failUnless(re.search('<input (type="hidden" |name="t" |value="report-incident" ){3}/>',res), res)
|
{u"href": u"status"},
|
||||||
self.failUnlessIn('Page rendered at', res)
|
)
|
||||||
self.failUnlessIn('Tahoe-LAFS code imported from:', res)
|
assert_soup_has_tag_with_attributes_and_content(
|
||||||
res_u = res.decode('utf-8')
|
self, soup, u"a",
|
||||||
self.failUnlessIn(u'<td>fake_nickname \u263A</td>', res_u)
|
u"Operational Statistics",
|
||||||
self.failUnlessIn(u'<div class="nickname">other_nickname \u263B</div>', res_u)
|
{u"href": u"statistics"},
|
||||||
self.failUnlessIn(u'Connected to <span>1</span>\n of <span>2</span> known storage servers', res_u)
|
)
|
||||||
def timestamp(t):
|
assert_soup_has_tag_with_attributes(
|
||||||
return (u'"%s"' % (t,)) if self.have_working_tzset() else u'"[^"]*"'
|
self, soup, u"input",
|
||||||
|
{u"type": u"hidden", u"name": u"t", u"value": u"report-incident"},
|
||||||
|
)
|
||||||
|
assert_soup_has_text(self, soup, "Page rendered at")
|
||||||
|
assert_soup_has_tag_with_content(self, soup, u"td", u"fake_nickname \u263A")
|
||||||
|
assert_soup_has_tag_with_attributes_and_content(
|
||||||
|
self, soup, u"div",
|
||||||
|
u"other_nickname \u263B",
|
||||||
|
{u"class": u"nickname"},
|
||||||
|
)
|
||||||
|
# self.failUnlessIn(u'Connected to <span>1</span>\n of <span>2</span> known storage servers', res_u)
|
||||||
|
divs = soup.find_all(u"div")
|
||||||
|
found_status = False
|
||||||
|
for div in divs:
|
||||||
|
if u"status-indicator" in div.attrs.get(u"class", []):
|
||||||
|
imgs = div.find_all(u"img")
|
||||||
|
if imgs and imgs[0].attrs.get(u"src", u"") == u"img/connected-yes.png":
|
||||||
|
found_status = True
|
||||||
|
sib = div.find_next_siblings()[0]
|
||||||
|
self.assert_(u"nickname" in sib.attrs[u"class"])
|
||||||
|
self.assert_(u"other_nickname \u263B" in sib.contents)
|
||||||
|
self.assert_(found_status, "no status-indicator found")
|
||||||
|
|
||||||
# TODO: use a real parser to make sure these two nodes are siblings
|
if self.have_working_tzset():
|
||||||
self.failUnless(re.search(
|
assert_soup_has_tag_with_attributes_and_content(
|
||||||
u'<div class="status-indicator"><img (src="img/connected-yes.png" |alt="Connected" ){2}/></div>'
|
self, soup, u"a",
|
||||||
u'\s+'
|
u"1d\u00A00h\u00A00m\u00A050s",
|
||||||
u'<div class="nickname">other_nickname \u263B</div>',
|
{u"class": u"timestamp", u"title": u"1970-01-01 13:00:10" }
|
||||||
res_u), repr(res_u))
|
)
|
||||||
self.failUnless(re.search(
|
|
||||||
u'<a( class="timestamp"| title=%s){2}>\s+1d\u00A00h\u00A00m\u00A050s\s+</a>'
|
|
||||||
% timestamp(u'1970-01-01 13:00:10'), res_u), repr(res_u))
|
|
||||||
|
|
||||||
# same for these two nodes
|
found_status = False
|
||||||
self.failUnless(re.search(
|
for div in divs:
|
||||||
u'<div class="status-indicator"><img (src="img/connected-no.png" |alt="Disconnected" ){2}/></div>'
|
if u"status-indicator" in div.attrs.get(u"class", []):
|
||||||
u'\s+'
|
imgs = div.find_all(u"img")
|
||||||
u'<div class="nickname">disconnected_nickname \u263B</div>',
|
if imgs and imgs[0].attrs.get(u"src", u"") == u"img/connected-no.png" and imgs[0].attrs.get(u"alt", u"") == u"Disconnected":
|
||||||
res_u), repr(res_u))
|
# since we don't connect to any introducer, we
|
||||||
self.failUnless(re.search(
|
# find that one first .. but we want to look for
|
||||||
u'<a( class="timestamp"| title="N/A"){2}>\s+N/A\s+</a>',
|
# the disconnected storage node..
|
||||||
res_u), repr(res_u))
|
sib = div.find_next_siblings()[0]
|
||||||
|
if u"No introducers connected" in sib.contents:
|
||||||
|
continue
|
||||||
|
found_status = True
|
||||||
|
self.assert_(u"nickname" in sib.attrs.get(u"class", []))
|
||||||
|
self.assert_(u"disconnected_nickname \u263B" in sib.contents)
|
||||||
|
self.assert_(found_status, "no status-indicator found")
|
||||||
|
|
||||||
self.failUnless(re.search(
|
|
||||||
u'<td class="service-last-received-data"><a( class="timestamp"| title=%s){2}>'
|
|
||||||
u'1d\u00A00h\u00A00m\u00A030s</a></td>'
|
|
||||||
% timestamp(u'1970-01-01 13:00:30'), res_u), repr(res_u))
|
|
||||||
self.failUnless(re.search(
|
|
||||||
u'<td class="service-last-received-data"><a( class="timestamp"| title=%s){2}>'
|
|
||||||
u'1d\u00A00h\u00A00m\u00A025s</a></td>'
|
|
||||||
% timestamp(u'1970-01-01 13:00:35'), res_u), repr(res_u))
|
|
||||||
|
|
||||||
self.failUnlessIn(u'\u00A9 <a href="https://tahoe-lafs.org/">Tahoe-LAFS Software Foundation', res_u)
|
assert_soup_has_tag_with_attributes_and_content(
|
||||||
self.failUnlessIn('<td><h3>Available</h3></td>', res)
|
self, soup, u"a",
|
||||||
self.failUnlessIn('123.5kB', res)
|
u"N/A",
|
||||||
|
{u"class": u"timestamp", u"title": u"N/A"},
|
||||||
|
)
|
||||||
|
stamps = []
|
||||||
|
timestamps = []
|
||||||
|
for t in soup.find_all(u"td"):
|
||||||
|
if u"service-last-received-data" in t.attrs.get(u"class", []):
|
||||||
|
a = t.find_all(u"a")
|
||||||
|
stamps.append(a[0].contents[0])
|
||||||
|
timestamps.append(a[0].attrs.get(u"title", u""))
|
||||||
|
self.assertIn(u"1d\u00A00h\u00A00m\u00A030s", stamps)
|
||||||
|
self.assertIn(u"1d\u00A00h\u00A00m\u00A025s", stamps) # huh? should be 35s .. i think?
|
||||||
|
self.assertIn(u'1970-01-01 13:00:30', timestamps)
|
||||||
|
self.assertIn(u'1970-01-01 13:00:35', timestamps)
|
||||||
|
|
||||||
|
assert_soup_has_text(self, soup, u"Tahoe-LAFS Software Foundation")
|
||||||
|
assert_soup_has_tag_with_content(self, soup, u"h3", u"Available")
|
||||||
|
assert_soup_has_text(self, soup, u"123.5kB")
|
||||||
|
|
||||||
|
# wait, WTF? why is this in a TEST?
|
||||||
self.s.basedir = 'web/test_welcome'
|
self.s.basedir = 'web/test_welcome'
|
||||||
fileutil.make_dirs("web/test_welcome")
|
fileutil.make_dirs("web/test_welcome")
|
||||||
fileutil.make_dirs("web/test_welcome/private")
|
fileutil.make_dirs("web/test_welcome/private")
|
||||||
return self.GET("/")
|
|
||||||
d.addCallback(_check)
|
|
||||||
return d
|
|
||||||
|
|
||||||
def test_introducer_status(self):
|
def test_introducer_status(self):
|
||||||
class MockIntroducerClient(object):
|
class MockIntroducerClient(object):
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user