Changeset 685aaf1 in trunk

Timestamp:

2020-04-18T07:52:17Z (5 years ago)

Author:

meejah <meejah@…>

Branches:

master

Children:

956d67b9

Parents:

af35483

git-author:

meejah <meejah@…> (2019-12-28 04:07:28)

git-committer:

meejah <meejah@…> (2020-04-18 07:52:17)

Message:

soup, not re

File:

• src/allmydata/test/web/test_web.py (modified) (2 diffs)

src/allmydata/test/web/test_web.py ¶

@@ -2013 +2013 @@
         # look at a readonly directory
         data = yield self.GET(self.public_url + "/reedownlee", followRedirect=True)
-        soup = BeautifulSoup(data, 'html5lib')
         self.failUnlessIn("(read-only)", data)
         self.failIfIn("Upload a file", data)
@@ -2037 +2036 @@
         soup = BeautifulSoup(data, 'html5lib')
         self.failUnlessIn("directory is empty", data)
-        MKDIR_BUTTON_RE=re.compile('<input (type="hidden" |name="t" |value="mkdir" ){3}/>.*<legend class="freeform-form-label">Create a new directory in this directory</legend>.*<input (type="submit" |class="btn" |value="Create" ){3}/>', re.I)
-        self.failUnless(MKDIR_BUTTON_RE.search(data), data)
+        mkdir_inputs = soup.find_all(u"input", {u"type": u"hidden", u"name": u"t", u"value": u"mkdir"})
+        self.assertEqual(1, len(mkdir_inputs))
+        self.assertEqual(
+            u"Create a new directory in this directory",
+            mkdir_inputs[0].parent(u"legend")[0].text
+        )
 
     @inlineCallbacks