[cli] Fix --config-file command line option

Author: amotl

CHANGES.rst

@@ -21,6 +21,7 @@ in progress
 - [ntfy] [Frigate] Improve example/tutorial about Frigate event notifications
 - [ntfy] [Frigate] Synchronize JSON event and snapshot image receive order
 - [ntfy] [Frigate] Tests: Verify notification was properly received by ntfy
+- [cli] Fix ``--config-file`` command line option
 
 
 2023-04-11 0.33.0

mqttwarn/commands.py

@@ -90,7 +90,7 @@ def run():
 
     # Run mqttwarn in service mode when no command line arguments are given
     else:
-        run_mqttwarn()
+        run_mqttwarn(configfile=options["--config-file"])
 
 
 def launch_plugin_standalone(
@@ -131,13 +131,13 @@ def launch_plugin_standalone(
     run_plugin(config=config, name=plugin, options=options, data=data)
 
 
-def run_mqttwarn():
+def run_mqttwarn(configfile: t.Optional[str] = None):
 
     # Script name (without extension) used as last resort fallback for config/logfile names
     scriptname = os.path.splitext(os.path.basename(sys.argv[0]))[0]
 
     # Load configuration file
-    config = load_configuration(name=scriptname)
+    config = load_configuration(configfile=configfile, name=scriptname)
 
     # Setup logging
     setup_logging(config)

tests/test_commands.py

@@ -33,9 +33,10 @@ def test_mqttwarn_main_help(capsys):
     assert "Usage:" in capsys.readouterr().out
 
 
-def test_run_mqttwarn(mocker, caplog):
+def test_run_mqttwarn_with_configuration_from_environment(mocker, caplog):
     """
     Verify that `mqttwarn.commands.run_mqttwarn` works as expected.
+    Here, a configuration file is obtained using the `MQTTWARNINI` environment variable.
     """
     mocker.patch("os.environ", {"MQTTWARNINI": "tests/etc/no-functions.ini"})
     mocker.patch("sys.argv", ["mqttwarn"])
@@ -48,7 +49,22 @@ def test_run_mqttwarn(mocker, caplog):
     ]
 
 
-def test_run(mocker, caplog):
+def test_run_mqttwarn_with_configuration_from_file(mocker, caplog):
+    """
+    Verify that `mqttwarn.commands.run_mqttwarn` works as expected.
+    Here, a configuration file is obtained using the `--config-file` command line option.
+    """
+    mocker.patch("sys.argv", ["mqttwarn-custom"])
+    mocker.patch("mqttwarn.commands.subscribe_forever")
+    mqttwarn.commands.run_mqttwarn(configfile="tests/etc/no-functions.ini")
+
+    assert caplog.messages == [
+        "Starting mqttwarn-custom",
+        "Log level is DEBUG",
+    ]
+
+
+def test_run_command(mocker, caplog):
     """
     Verify that `mqttwarn.commands.run` works as expected.
     """