* Fix a test based on updated output.

* Add a stub for the -confirm email command
* Add stubs for -leave and -unsubscribe
* Remove the crufty (and broken) 'tojoin' 'toleave' and 'toconfirm' metadata
  keys for synchronizing between lmtp and the command runner.  Replace this by
  putting the subaddress recognized by lmtp into the metadata and having the
  command runner look at the subaddress.

1 files changed, 4 insertions, 3 deletions

diff --git a/src/mailman/queue/command.py b/src/mailman/queue/command.py
index 178d2ba0b..f36f9a31d 100644
--- a/src/mailman/queue/command.py
+++ b/src/mailman/queue/command.py
@@ -60,11 +60,12 @@ class CommandFinder:
         # commands.  For example, if this was sent to the -join or -leave
         # addresses, it's the same as if 'join' or 'leave' commands were sent
         # to the -request address.
-        if msgdata.get('tojoin'):
+        subaddress = msgdata.get('subaddress')
+        if subaddress == 'join':
             self.command_lines.append('join')
-        elif msgdata.get('toleave'):
+        elif subaddress == 'leave':
             self.command_lines.append('leave')
-        elif msgdata.get('toconfirm'):
+        elif subaddress == 'confirm':
             mo = re.match(config.mta.verp_confirm_regexp, msg.get('to', ''))
             if mo:
                 self.command_lines.append('confirm ' + mo.group('cookie'))