From a5b060765d9477a84dd72731f92e6c6545d475de Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Mike=20F=C3=A4hrmann?= <mike_faehrmann@web.de>
Date: Mon, 13 May 2019 11:48:20 +0200
Subject: [PATCH] improve code in tests

- use 'assertRaises' as context manager
- remove calls to .keys()
---
 test/test_cookies.py | 16 ++++++++--------
 test/test_results.py |  3 ++-
 test/test_util.py    | 13 +++++++++----
 3 files changed, 19 insertions(+), 13 deletions(-)

diff --git a/test/test_cookies.py b/test/test_cookies.py
index cbbe2f2b..f1b87ae0 100644
--- a/test/test_cookies.py
+++ b/test/test_cookies.py
@@ -53,9 +53,9 @@ class TestCookiejar(unittest.TestCase):
 
         cookie = next(iter(cookies))
         self.assertEqual(cookie.domain, ".example.org")
-        self.assertEqual(cookie.path, "/")
-        self.assertEqual(cookie.name, "NAME")
-        self.assertEqual(cookie.value, "VALUE")
+        self.assertEqual(cookie.path  , "/")
+        self.assertEqual(cookie.name  , "NAME")
+        self.assertEqual(cookie.value , "VALUE")
 
     def test_invalid_cookiefile(self):
         self._test_warning(self.invalid_cookiefile, http.cookiejar.LoadError)
@@ -86,14 +86,14 @@ class TestCookiedict(unittest.TestCase):
     def test_dict(self):
         cookies = extractor.find("test:").session.cookies
         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()))
 
     def test_domain(self):
         for category in ["exhentai", "nijie", "sankaku", "seiga"]:
             extr = _get_extractor(category)
             cookies = extr.session.cookies
-            for key in self.cdict.keys():
+            for key in self.cdict:
                 self.assertTrue(key in cookies)
             for c in cookies:
                 self.assertEqual(c.domain, extr.cookiedomain)
@@ -107,9 +107,9 @@ class TestCookieLogin(unittest.TestCase):
     def test_cookie_login(self):
         extr_cookies = {
             "exhentai": ("ipb_member_id", "ipb_pass_hash"),
-            "nijie": ("nemail", "nlogin"),
-            "sankaku": ("login", "pass_hash"),
-            "seiga": ("user_session",),
+            "nijie"   : ("nemail", "nlogin"),
+            "sankaku" : ("login", "pass_hash"),
+            "seiga"   : ("user_session",),
         }
         for category, cookienames in extr_cookies.items():
             cookies = {name: "value" for name in cookienames}
diff --git a/test/test_results.py b/test/test_results.py
index e0b8cbbf..05d4291a 100644
--- a/test/test_results.py
+++ b/test/test_results.py
@@ -55,7 +55,8 @@ class TestExtractorResults(unittest.TestCase):
         if not result:
             return
         if "exception" in result:
-            self.assertRaises(result["exception"], tjob.run)
+            with self.assertRaises(result["exception"]):
+                tjob.run()
             return
         try:
             tjob.run()
diff --git a/test/test_util.py b/test/test_util.py
index 8e07143c..87197c46 100644
--- a/test/test_util.py
+++ b/test/test_util.py
@@ -304,12 +304,17 @@ class TestOther(unittest.TestCase):
             util.advance(util.advance(items, 1), 2), range(3, 5))
 
     def test_raises(self):
-        self.assertRaises(Exception, util.raises(Exception()))
+        func = util.raises(Exception())
+        with self.assertRaises(Exception):
+            func()
 
         func = util.raises(ValueError(1))
-        self.assertRaises(Exception, func)
-        self.assertRaises(Exception, func)
-        self.assertRaises(Exception, func)
+        with self.assertRaises(ValueError):
+            func()
+        with self.assertRaises(ValueError):
+            func()
+        with self.assertRaises(ValueError):
+            func()
 
     def test_combine_dict(self):
         self.assertEqual(