[MERGE][BUG] 92195: merge-directive does not respect smtp_server setting

[John Arbash Meinel]

Vincent Ladeuil wrote:
> Trivial fix attached.
> 
...

v- I think we actually need 2 tests, one which ensure the fallback to 
'localhost' works when nothing is set. And another one which ensures 
that when one is set, it is used. These don't have to be huge tests, 
ideally we would *only* test that the smtp host is correct.

>          self.build_tree_contents([('tree1/file', 'a\nb\nc\nd\n')])
>          tree1.branch.get_config().set_user_option('email',
>              'J. Random Hacker <jrandom at example.com>')
> +        tree1.branch.get_config().set_user_option('smtp_server', 'bogushost')
>          tree1.add('file')
>          tree1.commit('foo')
>          tree2=tree1.bzrdir.sprout('tree2').open_workingtree()
> @@ -119,7 +120,7 @@
>          self.assertEqual('', md_text)
>          self.assertEqual(1, len(connect_calls))
>          call = connect_calls[0]
> -        self.assertEqual(('localhost', 0), call[1:3])
> +        self.assertEqual(('bogushost', 0), call[1:3])
>          self.assertEqual(1, len(sendmail_calls))
>          call = sendmail_calls[0]
>          self.assertEqual(('J. Random Hacker <jrandom at example.com>',


So +0.5 for me.

John
=:->