diff options
| author | Benedikt <wisp3rwind@posteo.eu> | 2022-01-20 23:41:33 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-01-20 23:41:33 +0100 |
| commit | 2744e593f66b419c5daedcd79edeb9e8bd546d8d (patch) | |
| tree | 219b1d5902370449dacbf85868997b5491ea1dfd | |
| parent | 4905e0f5f573c35d06f2fb2f186d0652b53a5f5a (diff) | |
| parent | c272696d9f6bc8426ebb961906d0deea5c841d9e (diff) | |
Merge pull request #4244 from wisp3rwind/pr_fix_reraise
Fix exception handling in tests
| -rw-r--r-- | test/test_logging.py | 16 | ||||
| -rw-r--r-- | test/test_replaygain.py | 14 |
2 files changed, 9 insertions, 21 deletions
diff --git a/test/test_logging.py b/test/test_logging.py index 8a9fd8742..79ff5cae2 100644 --- a/test/test_logging.py +++ b/test/test_logging.py @@ -175,7 +175,7 @@ class ConcurrentEventsTest(TestCase, helper.TestHelper): self.lock1 = threading.Lock() self.lock2 = threading.Lock() self.test_case = test_case - self.exc_info = None + self.exc = None self.t1_step = self.t2_step = 0 def log_all(self, name): @@ -190,9 +190,8 @@ class ConcurrentEventsTest(TestCase, helper.TestHelper): self.lock1.acquire() self.test_case.assertEqual(self._log.level, log.INFO) self.t1_step = 2 - except Exception: - import sys - self.exc_info = sys.exc_info() + except Exception as e: + self.exc = e def listener2(self): try: @@ -201,9 +200,8 @@ class ConcurrentEventsTest(TestCase, helper.TestHelper): self.lock2.acquire() self.test_case.assertEqual(self._log.level, log.DEBUG) self.t2_step = 2 - except Exception: - import sys - self.exc_info = sys.exc_info() + except Exception as e: + self.exc = e def setUp(self): self.setup_beets(disk=True) @@ -215,8 +213,8 @@ class ConcurrentEventsTest(TestCase, helper.TestHelper): dp = self.DummyPlugin(self) def check_dp_exc(): - if dp.exc_info: - raise None.with_traceback(dp.exc_info[2]) + if dp.exc: + raise dp.exc try: dp.lock1.acquire() diff --git a/test/test_replaygain.py b/test/test_replaygain.py index b39a4e990..58b487fad 100644 --- a/test/test_replaygain.py +++ b/test/test_replaygain.py @@ -55,18 +55,8 @@ class ReplayGainCliTestBase(TestHelper): try: self.load_plugins('replaygain') except Exception: - import sys - # store exception info so an error in teardown does not swallow it - exc_info = sys.exc_info() - try: - self.teardown_beets() - self.unload_plugins() - except Exception: - # if load_plugins() failed then setup is incomplete and - # teardown operations may fail. In particular # {Item,Album} - # may not have the _original_types attribute in unload_plugins - pass - raise None.with_traceback(exc_info[2]) + self.teardown_beets() + self.unload_plugins() album = self.add_album_fixture(2) for item in album.items(): |