python-telegram-bot · Bibo-Joshi · Apr 17, 2022 · Mar 26, 2022 · Mar 26, 2022 · Mar 26, 2022
diff --git a/telegram/error.py b/telegram/error.py
@@ -74,9 +74,8 @@ def __init__(self, message: str):
     def __str__(self) -> str:
         return self.message
 
-    # TODO: test this
     def __repr__(self) -> str:
-        return f'{self.__class__.__name__}({self.message})'
+        return f"{self.__class__.__name__}('{self.message}')"
 
     def __reduce__(self) -> Tuple[type, Tuple[str]]:
         return self.__class__, (self.message,)

diff --git a/telegram/ext/_utils/trackingdict.py b/telegram/ext/_utils/trackingdict.py
@@ -57,7 +57,7 @@ class TrackingDict(UserDict, Generic[_KT, _VT]):
     DELETED: ClassVar = object()
     """Special marker indicating that an entry was deleted."""
 
-    __slots__ = ('_data', '_write_access_keys')
+    __slots__ = ('_write_access_keys',)
 
     def __init__(self) -> None:
         super().__init__()

diff --git a/tests/conftest.py b/tests/conftest.py
@@ -155,13 +155,15 @@ class DictApplication(Application):
 @pytest.fixture(scope='session')
 @pytest.mark.asyncio
 async def bot(bot_info):
+    """Makes an ExtBot instance with the given bot_info"""
     async with make_bot(bot_info) as _bot:
         yield _bot
 
 
 @pytest.fixture(scope='session')
 @pytest.mark.asyncio
 async def raw_bot(bot_info):
+    """Makes an regular Bot instance with the given bot_info"""
     async with DictBot(
         bot_info['token'],
         private_key=PRIVATE_KEY,

diff --git a/tests/test_application.py b/tests/test_application.py
@@ -1609,3 +1609,48 @@ def test_run_without_updater(self, bot):
 
         with pytest.raises(RuntimeError, match='only available if the application has an Updater'):
             app.run_polling()
+
+    @pytest.mark.parametrize('method', ['start', 'initialize'])
+    def test_run_error_in_application(self, bot, monkeypatch, method):
+        shutdowns = []
+
+        async def raise_method(*args, **kwargs):
+            raise RuntimeError('Test Exception')
+
+        async def shutdown(*args, **kwargs):
+            shutdowns.append(True)
+
+        monkeypatch.setattr(Application, method, raise_method)
+        monkeypatch.setattr(Application, 'shutdown', shutdown)
+        monkeypatch.setattr(Updater, 'shutdown', shutdown)
+        app = ApplicationBuilder().token(bot.token).build()
+        with pytest.raises(RuntimeError, match='Test Exception'):
+            app.run_polling(close_loop=False)
+
+        assert not app.running
+        assert not app.updater.running
+        assert shutdowns == [True, True]
+
+    @pytest.mark.parametrize('method', ['start_polling', 'start_webhook'])
+    def test_run_error_in_updater(self, bot, monkeypatch, method):
+        shutdowns = []
+
+        async def raise_method(*args, **kwargs):
+            raise RuntimeError('Test Exception')
+
+        async def shutdown(*args, **kwargs):
+            shutdowns.append(True)
+
+        monkeypatch.setattr(Updater, method, raise_method)
+        monkeypatch.setattr(Application, 'shutdown', shutdown)
+        monkeypatch.setattr(Updater, 'shutdown', shutdown)
+        app = ApplicationBuilder().token(bot.token).build()
+        with pytest.raises(RuntimeError, match='Test Exception'):
+            if 'polling' in method:
+                app.run_polling(close_loop=False)
+            else:
+                app.run_webhook(close_loop=False)
+
+        assert not app.running
+        assert not app.updater.running
+        assert shutdowns == [True, True]
diff --git a/tests/test_applicationbuilder.py b/tests/test_applicationbuilder.py
@@ -44,6 +44,11 @@ def builder():
 
 
 class TestApplicationBuilder:
+    def test_slot_behaviour(self, builder, mro_slots):
+        for attr in builder.__slots__:
+            assert getattr(builder, attr, 'err') != 'err', f"got extra slot '{attr}'"
+        assert len(mro_slots(builder)) == len(set(mro_slots(builder))), "duplicate slot"
+
     def test_build_without_token(self, builder):
         with pytest.raises(RuntimeError, match='No bot token was set.'):
             builder.build()