github/gallery-dl
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

improve code in tests

Browse Source 
- use 'assertRaises' as context manager
- remove calls to .keys()
This commit is contained in:
Mike Fährmann
2019-05-13 11:48:20 +02:00
parent ba8eb1ffec
commit a5b060765d
3 changed files with 19 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
test/test_cookies.py
View File

@@ -53,9 +53,9 @@ class TestCookiejar(unittest.TestCase):
cookie = next(iter(cookies)) cookie = next(iter(cookies))
self.assertEqual(cookie.domain, ".example.org") self.assertEqual(cookie.domain, ".example.org")
self.assertEqual(cookie.path, "/") self.assertEqual(cookie.path , "/")
self.assertEqual(cookie.name, "NAME") self.assertEqual(cookie.name , "NAME")
self.assertEqual(cookie.value, "VALUE") self.assertEqual(cookie.value , "VALUE")
def test_invalid_cookiefile(self): def test_invalid_cookiefile(self):
self._test_warning(self.invalid_cookiefile, http.cookiejar.LoadError) self._test_warning(self.invalid_cookiefile, http.cookiejar.LoadError)
@@ -86,14 +86,14 @@ class TestCookiedict(unittest.TestCase):
def test_dict(self): def test_dict(self):
cookies = extractor.find("test:").session.cookies cookies = extractor.find("test:").session.cookies
self.assertEqual(len(cookies), len(self.cdict)) self.assertEqual(len(cookies), len(self.cdict))
self.assertEqual(sorted(cookies.keys()), sorted(self.cdict.keys())) self.assertEqual(sorted(cookies), sorted(self.cdict))
self.assertEqual(sorted(cookies.values()), sorted(self.cdict.values())) self.assertEqual(sorted(cookies.values()), sorted(self.cdict.values()))
def test_domain(self): def test_domain(self):
for category in ["exhentai", "nijie", "sankaku", "seiga"]: for category in ["exhentai", "nijie", "sankaku", "seiga"]:
extr = _get_extractor(category) extr = _get_extractor(category)
cookies = extr.session.cookies cookies = extr.session.cookies
for key in self.cdict.keys(): for key in self.cdict:
self.assertTrue(key in cookies) self.assertTrue(key in cookies)
for c in cookies: for c in cookies:
self.assertEqual(c.domain, extr.cookiedomain) self.assertEqual(c.domain, extr.cookiedomain)
@@ -107,9 +107,9 @@ class TestCookieLogin(unittest.TestCase):
def test_cookie_login(self): def test_cookie_login(self):
extr_cookies = { extr_cookies = {
"exhentai": ("ipb_member_id", "ipb_pass_hash"), "exhentai": ("ipb_member_id", "ipb_pass_hash"),
"nijie": ("nemail", "nlogin"), "nijie" : ("nemail", "nlogin"),
"sankaku": ("login", "pass_hash"), "sankaku" : ("login", "pass_hash"),
"seiga": ("user_session",), "seiga" : ("user_session",),
} }
for category, cookienames in extr_cookies.items(): for category, cookienames in extr_cookies.items():
cookies = {name: "value" for name in cookienames} cookies = {name: "value" for name in cookienames}

3
test/test_results.py
View File

@@ -55,7 +55,8 @@ class TestExtractorResults(unittest.TestCase):
if not result: if not result:
return return
if "exception" in result: if "exception" in result:
self.assertRaises(result["exception"], tjob.run) with self.assertRaises(result["exception"]):
tjob.run()
return return
try: try:
tjob.run() tjob.run()

13
test/test_util.py
View File

@@ -304,12 +304,17 @@ class TestOther(unittest.TestCase):
util.advance(util.advance(items, 1), 2), range(3, 5)) util.advance(util.advance(items, 1), 2), range(3, 5))
def test_raises(self): def test_raises(self):
self.assertRaises(Exception, util.raises(Exception())) func = util.raises(Exception())
with self.assertRaises(Exception):
func()
func = util.raises(ValueError(1)) func = util.raises(ValueError(1))
self.assertRaises(Exception, func) with self.assertRaises(ValueError):
self.assertRaises(Exception, func) func()
self.assertRaises(Exception, func) with self.assertRaises(ValueError):
func()
with self.assertRaises(ValueError):
func()
def test_combine_dict(self): def test_combine_dict(self):
self.assertEqual( self.assertEqual(