apprise_single service: Add backward compatibility with "apprise.py"

Author: amotl

HANDBOOK.md

@@ -533,7 +533,7 @@ launch    = apprise-mail, apprise-json, apprise-discord
 [config:apprise-mail]
 ; Dispatch message as e-mail.
 ; https://github.com/caronc/apprise/wiki/Notify_email
-module   = 'apprise'
+module   = 'apprise_single'
 baseuri  = 'mailtos://smtp_username:[email protected]'
 sender   = '[email protected]'
 sender_name = 'Example Monitoring'
@@ -544,7 +544,7 @@ targets  = {
 [config:apprise-json]
 ; Dispatch message to HTTP endpoint, in JSON format.
 ; https://github.com/caronc/apprise/wiki/Notify_Custom_JSON
-module   = 'apprise'
+module   = 'apprise_single'
 baseuri  = 'json://localhost:1234/mqtthook'
 
 [config:apprise-discord]

mqttwarn/services/apprise.py

@@ -0,0 +1 @@
+from mqttwarn.services.apprise_single import plugin

tests/acme/foobar.py

@@ -1,3 +1,3 @@
 def plugin(srv, item):
     srv.logging.debug("*** MODULE=%s: service=%s, target=%s", __file__, item.service, item.target)
-    srv.logging.info("Plugin invoked.")
+    srv.logging.info("Plugin invoked")

tests/services/test_apprise_single.py

@@ -208,3 +208,32 @@ def test_apprise_success_with_sender(apprise_asset, apprise_mock, srv, caplog):
 
         assert outcome is True
         assert "Successfully sent message using Apprise" in caplog.text
+
+
+@surrogate("apprise")
+@mock.patch("apprise.Apprise", create=True)
+@mock.patch("apprise.AppriseAsset", create=True)
+def test_apprise_success_backward_compat(apprise_asset, apprise_mock, srv, caplog):
+
+    with caplog.at_level(logging.DEBUG):
+
+        module = load_module_from_file("mqttwarn/services/apprise.py")
+
+        item = Item(
+            config={"baseuri": "json://localhost:1234/mqtthook"},
+            title="⚽ Message title ⚽",
+            message="⚽ Notification message ⚽",
+        )
+
+        outcome = module.plugin(srv, item)
+
+        assert apprise_mock.mock_calls == [
+            call(asset=mock.ANY),
+            call().add("json://localhost:1234/mqtthook"),
+            call().notify(body="⚽ Notification message ⚽", title="⚽ Message title ⚽"),
+            call().notify().__bool__(),
+        ]
+
+        assert outcome is True
+        assert "Sending notification to Apprise. target=None, addresses=[]" in caplog.messages
+        assert "Successfully sent message using Apprise" in caplog.messages

tests/test_core.py

@@ -194,7 +194,7 @@ def test_plugin_module(caplog, configfile):
         )
 
         # Proof that the message has been routed to the "log" plugin properly
-        assert "Plugin invoked" in caplog.text, caplog.text
+        assert "Plugin invoked" in caplog.messages
 
 
 @pytest.mark.parametrize("configfile", [configfile_full, configfile_service_loading])
@@ -212,7 +212,7 @@ def test_plugin_file(caplog, configfile):
         send_message(topic="test/plugin-file", payload='{"name": "temperature", "value": 42.42}')
 
         # Proof that the message has been routed to the "log" plugin properly
-        assert "Plugin invoked" in caplog.text, caplog.text
+        assert "Plugin invoked" in caplog.messages
 
 
 def test_xform_func(caplog):