Catch second mastodon post failure

.github/workflows/build.yml

@@ -48,10 +48,11 @@ jobs:
 
     - name: Build and Test
       run: |
+        set -e
         # pip install from requirements.txt
         python -m pip install -r pip_requirements.txt
         python -m pip install . --upgrade
-        coverage run --source=src setup.py test
+        coverage run --source=iembot setup.py test
         coverage xml
 
     - name: Code coverage

src/iembot/util.py

@@ -139,21 +139,24 @@
         # Submitted too quickly
         log.err(exp)
         # Since this called from a thread, sleeping should not jam us up
-        time.sleep(10)
+        time.sleep(kwargs.get("sleep", 10))
         res = api.status_post(**params)
     except mastodon.errors.MastodonError as exp:
         # Something else bad happened when submitting this to the Mastodon server
         log.err(exp)
         params.pop("media_ids", None)  # Try again without media
         # Since this called from a thread, sleeping should not jam us up
-        time.sleep(10)
-        res = api.status_post(**params)
+        time.sleep(kwargs.get("sleep", 10))
+        try:
+            res = api.status_post(**params)
+        except mastodon.errors.MastodonError as exp2:
+            log.err(exp2)
     except Exception as exp:
         # Something beyond Mastodon went wrong
         log.err(exp)
         params.pop("media_ids", None)  # Try again without media
         # Since this called from a thread, sleeping should not jam us up
-        time.sleep(10)
+        time.sleep(kwargs.get("sleep", 10))
         res = api.status_post(**params)
     return res
 

tests/test_util.py

@@ -22,6 +22,19 @@ def test_load_mastodon_from_db(dbcursor):
     assert isinstance(bot.md_users, dict)
 
 
+def test_util_toot():
+    """Test the method."""
+    bot = JabberClient(None, None, xml_log_path="/tmp")
+    bot.md_users = {
+        "123": {
+            "screen_name": "iembot",
+            "access_token": "123",
+            "api_base_url": "https://localhost",
+        }
+    }
+    botutil.toot(bot, "123", "test", sleep=0)
+
+
 def test_load_chatlog():
     """Test our pickling fun."""
     bot = JabberClient(None, None, xml_log_path="/tmp")