From d5dd8b1668137738aff2bdb4acf57463af3c1e00 Mon Sep 17 00:00:00 2001
From: Ivan Schaller <ivan@schaller.sh>
Date: Sat, 11 Feb 2023 13:57:06 +0100
Subject: [PATCH] fix tests and except catches

---
 mangadlp/api/mangadex.py      |  2 +-
 tests/test_02_utils.py        |  4 ++--
 tests/test_03_downloader.py   |  4 ++--
 tests/test_11_api_mangadex.py | 21 ++++++++++-----------
 4 files changed, 15 insertions(+), 16 deletions(-)

diff --git a/mangadlp/api/mangadex.py b/mangadlp/api/mangadex.py
index 40357fe..9c3417d 100644
--- a/mangadlp/api/mangadex.py
+++ b/mangadlp/api/mangadex.py
@@ -112,7 +112,7 @@ class Mangadex:
                     alt_title = item
                     break
             title = alt_title[self.language]
-        except KeyError:
+        except (KeyError, UnboundLocalError):
             log.warning(
                 "Manga title also not found in alt titles. Falling back to english title"
             )
diff --git a/tests/test_02_utils.py b/tests/test_02_utils.py
index e8a17fe..a13f277 100644
--- a/tests/test_02_utils.py
+++ b/tests/test_02_utils.py
@@ -27,9 +27,9 @@ def test_make_archive_false():
     archive_path = Path("tests/test_dir2.cbz")
     img_path = Path("tests/test_dir2")
     file_format = "cbz"
-    with pytest.raises(IOError) as e:
+    with pytest.raises(Exception) as e:
         utils.make_archive(img_path, file_format)
-    assert e.type == IOError
+    assert e.type == FileNotFoundError
     assert not archive_path.exists()
     # cleanup
     Path("tests/test_dir2.zip").unlink()
diff --git a/tests/test_03_downloader.py b/tests/test_03_downloader.py
index 2985a59..d9ea7df 100644
--- a/tests/test_03_downloader.py
+++ b/tests/test_03_downloader.py
@@ -42,9 +42,9 @@ def test_downloader_fail(monkeypatch):
     chapter_path = Path("tests/test_folder1")
     chapter_path.mkdir(parents=True, exist_ok=True)
     monkeypatch.setattr(requests, "get", fail_url)
-    with pytest.raises(ConnectionError) as e:
+    with pytest.raises(TypeError) as e:
         downloader.download_chapter(images, str(chapter_path), 2)
 
-    assert e.type == ConnectionError
+    assert e.type == TypeError
     # cleanup
     shutil.rmtree(chapter_path, ignore_errors=True)
diff --git a/tests/test_11_api_mangadex.py b/tests/test_11_api_mangadex.py
index 593d0c3..ad10b36 100644
--- a/tests/test_11_api_mangadex.py
+++ b/tests/test_11_api_mangadex.py
@@ -27,9 +27,9 @@ def test_uuid_link_false():
     language = "en"
     forcevol = False
 
-    with pytest.raises(RuntimeError) as e:
+    with pytest.raises(Exception) as e:
         Mangadex(url_uuid, language, forcevol)
-    assert e.type == RuntimeError
+    assert e.type == TypeError
 
 
 def test_title():
@@ -83,9 +83,9 @@ def test_non_existing_manga():
     language = "en"
     forcevol = False
 
-    with pytest.raises(RuntimeError) as e:
+    with pytest.raises(Exception) as e:
         Mangadex(url_uuid, language, forcevol)
-    assert e.type == RuntimeError
+    assert e.type == KeyError
 
 
 def test_api_failure(monkeypatch):
@@ -97,9 +97,9 @@ def test_api_failure(monkeypatch):
     language = "en"
     forcevol = False
 
-    with pytest.raises(RuntimeError) as e:
+    with pytest.raises(Exception) as e:
         Mangadex(url_uuid, language, forcevol)
-    assert e.type == RuntimeError
+    assert e.type == TypeError
 
 
 def test_chapter_lang_en():
@@ -116,10 +116,9 @@ def test_empty_chapter_lang():
     language = "ch"
     forcevol = False
 
-    with pytest.raises(RuntimeError) as e:
+    with pytest.raises(Exception) as e:
         Mangadex(url_uuid, language, forcevol)
-        Mangadex(url_uuid, language, forcevol).check_chapter_lang()
-    assert e.type == KeyError or e.type == RuntimeError
+    assert e.type == KeyError
 
 
 def test_not_existing_lang():
@@ -127,9 +126,9 @@ def test_not_existing_lang():
     language = "zz"
     forcevol = False
 
-    with pytest.raises(RuntimeError) as e:
+    with pytest.raises(Exception) as e:
         Mangadex(url_uuid, language, forcevol)
-    assert e.type == RuntimeError
+    assert e.type == KeyError
 
 
 def test_create_chapter_list():