tests: improve specificity

This commit is contained in:
ed 2024-12-01 15:36:35 +00:00
parent 21a3f3699b
commit 42fd66675e
6 changed files with 13 additions and 13 deletions

View file

@ -14,7 +14,7 @@ from tests import util as tu
from tests.util import Cfg
class TestDedup(unittest.TestCase):
class TestDedup(tu.TC):
def setUp(self):
self.td = tu.get_ramdisk()
@ -92,7 +92,7 @@ class TestDedup(unittest.TestCase):
HttpCli(self.conn.setbuf(buf)).run()
ret = self.conn.s._reply.decode("utf-8").split("\r\n\r\n", 1)
print("CP <-- ", ret)
self.assertIn(" 201 Created", ret[0])
self.assertStart("HTTP/1.1 201 Created\r", ret[0])
self.assertEqual("k\r\n", ret[1])
return ret

View file

@ -15,7 +15,7 @@ from tests import util as tu
from tests.util import Cfg
class TestDedup(unittest.TestCase):
class TestDedup(tu.TC):
def setUp(self):
self.td = tu.get_ramdisk()
@ -73,7 +73,7 @@ class TestDedup(unittest.TestCase):
sfn, hs = self.do_post_hs(dn, fns[0], f1, True)
for fn in fns[1:]:
h, b = self.handshake(dn, fn, f1)
self.assertIn(" 422 Unpro", h)
self.assertStart("HTTP/1.1 422 Unpro", h)
self.assertIn("a different location;", b)
self.do_post_data(dn, fns[0], f1, True, sfn, hs)
if not e2d:
@ -158,10 +158,10 @@ class TestDedup(unittest.TestCase):
rm = cms[irm]
dn, fn, _ = rm
h, b = self.curl("%s/%s?delete" % (dn, fn), meth="POST")
self.assertIn(" 200 OK", h)
self.assertStart("HTTP/1.1 200 OK", h)
self.assertIn("deleted 1 files", b)
h, b = self.curl("%s/%s" % (dn, fn))
self.assertIn(" 404 Not Fo", h)
self.assertStart("HTTP/1.1 404 Not Fo", h)
for cm in cms:
if cm == rm:
continue

View file

@ -124,7 +124,7 @@ class TestDXML(unittest.TestCase):
lk = parse_xml(txt)
self.assertEqual(lk.tag, "{DAV:}lockinfo")
if not lk.find(r"./{DAV:}depth"):
if lk.find(r"./{DAV:}depth") is None:
lk.append(mktnod("D:depth", "infinity"))
lk.append(mkenod("D:timeout", mktnod("D:href", "Second-3600")))

View file

@ -23,7 +23,7 @@ def hdr(query):
return h.format(query).encode("utf-8")
class TestHooks(unittest.TestCase):
class TestHooks(tu.TC):
def setUp(self):
self.conn: Optional[tu.VHttpConn] = None
self.td = tu.get_ramdisk()
@ -74,7 +74,7 @@ class TestHooks(unittest.TestCase):
self.cinit()
h, b = upfun(url_up)
self.assertIn("201 Created", h)
self.assertStart("HTTP/1.1 201 Created\r", h)
h, b = self.curl(url_dl)
self.assertEqual(b, "ok %s\n" % (url_up))

View file

@ -21,7 +21,7 @@ def hdr(query):
return h.format(query).encode("utf-8")
class TestMetrics(unittest.TestCase):
class TestMetrics(tu.TC):
def setUp(self):
self.td = tu.get_ramdisk()
os.chdir(self.td)
@ -55,7 +55,7 @@ class TestMetrics(unittest.TestCase):
self.conn = self.fstab = self.metrics = None
self.cinit()
h, b = self.curl(".cpr/metrics")
self.assertIn(".1 200 OK", h)
self.assertStart("HTTP/1.1 200 OK\r", h)
ptns = r"""
cpp_uptime_seconds [0-9]\.[0-9]{3}$
cpp_boot_unixtime_seconds [0-9]{7,10}\.[0-9]{3}$

View file

@ -20,7 +20,7 @@ TODO inject tags into db and verify ls
"""
class TestDedup(unittest.TestCase):
class TestDedup(tu.TC):
def setUp(self):
self.td = tu.get_ramdisk()
@ -130,7 +130,7 @@ class TestDedup(unittest.TestCase):
HttpCli(self.conn.setbuf(buf)).run()
ret = self.conn.s._reply.decode("utf-8").split("\r\n\r\n", 1)
print("MV <-- ", ret)
self.assertIn(" 201 Created", ret[0])
self.assertStart("HTTP/1.1 201 Created\r", ret[0])
self.assertEqual("k\r\n", ret[1])
return ret