mq-run/mq-send-test: use default config by default

README.md

@@ -39,12 +39,12 @@ was_queued = (getattr(send_result, 'queued', None) is not False)
 
 The `mq-run` script sends all queued messages to an SMTP server:
 
-    mq-run /path/to/config.ini /path/to/queue
+    mq-run --config=/path/to/config.ini /path/to/queue
 
 If you want to test your configuration you can send a test message to ensure
 the mail flow is set up correctly:
 
-    mq-send-test /path/to/config.ini /path/to/queue [email protected]
+    mq-send-test --config=/path/to/config.ini /path/to/queue [email protected]
 
 ### Configuration (mq-run)
 

schwarz/mailqueue/cli/one_shot_queue_run.py

@@ -5,6 +5,7 @@
 
 import docopt
 
+from ..app_helpers import guess_config_path
 from ..queue_runner import one_shot_queue_run
 
 
@@ -16,13 +17,14 @@ def one_shot_queue_run_main(argv=sys.argv, return_rc_code=False):
     """mq-run.
 
     Usage:
-        mq-run [options] <config> <queue_dir>
+        mq-run [options] <queue_dir>
 
     Options:
-        --verbose -v    more verbose program output
+        -C, --config=<CFG>  Path to the config file
+        --verbose -v        more verbose program output
     """
     arguments = docopt.docopt(one_shot_queue_run_main.__doc__, argv=argv[1:])
-    config_path = arguments['<config>']
+    config_path = guess_config_path(arguments['--config'])
     queue_dir = arguments['<queue_dir>']
     cli_options = {
         'verbose': arguments['--verbose'],

schwarz/mailqueue/cli/send_test_message.py

@@ -5,6 +5,7 @@
 
 import docopt
 
+from ..app_helpers import guess_config_path
 from ..mailflow_check import send_test_message
 
 
@@ -18,15 +19,16 @@ def send_test_message_main(argv=sys.argv, return_rc_code=False):
     Send a test message to ensure all SMTP credentials are correct.
 
     Usage:
-        mq-send-test [options] <config> --to=EMAIL
+        mq-send-test [options] --to=EMAIL
 
     Options:
-        --verbose -v    more verbose program output
+        -C, --config=<CFG>  Path to the config file
         --quiet         suppress (most) logging
         --from=FROM     sender email address
+        --verbose -v        more verbose program output
     """
     arguments = docopt.docopt(send_test_message_main.__doc__, argv=argv[1:])
-    config_path = arguments['<config>']
+    config_path = guess_config_path(arguments['--config'])
     cli_options = {
         'verbose': arguments['--verbose'],
         'recipient': arguments['--to'],

tests/mq_run_test.py

@@ -42,7 +42,7 @@ def test_mq_runner_can_load_plugins(tmp_path):
     inject_plugin_into_working_set('testplugin', fake_plugin)
     config_path = create_ini('host.example', port=12345, dir_path=str(tmp_path))
 
-    cmd = ['mq-run', config_path, queue_basedir]
+    cmd = ['mq-run', f'--config={config_path}', queue_basedir]
     mailer = DebugMailer(simulate_failed_sending=True)
     with mock.patch('schwarz.mailqueue.queue_runner.init_smtp_mailer', new=lambda s: mailer):
         rc = one_shot_queue_run_main(argv=cmd, return_rc_code=True)
@@ -59,7 +59,7 @@ def test_mq_runner_works_without_plugins(tmp_path):
     inject_example_message(queue_basedir)
     config_path = create_ini('host.example', port=12345, dir_path=str(tmp_path))
 
-    cmd = ['mq-run', config_path, queue_basedir]
+    cmd = ['mq-run', f'--config={config_path}', queue_basedir]
     mailer = DebugMailer(simulate_failed_sending=True)
     with mock.patch('schwarz.mailqueue.queue_runner.init_smtp_mailer', new=lambda s: mailer):
         rc = one_shot_queue_run_main(argv=cmd, return_rc_code=True)

tests/mq_send_test.py

@@ -33,7 +33,13 @@ def ctx():
 def test_mq_send_test_can_send_test_message(ctx, tmp_path):
     config_path = create_ini(ctx.hostname, ctx.listen_port, dir_path=str(tmp_path))
 
-    cmd = ['mq-send-test', config_path, '--quiet', '[email protected]', '[email protected]']  # noqa: E501 (line too long)
+    cmd = [
+        'mq-send-test',
+        f'--config={config_path}',
+        '--quiet',
+        '[email protected]',
+        '[email protected]',
+    ]
     rc = send_test_message_main(argv=cmd, return_rc_code=True)
     assert rc == 0