-
Committer:
Vincent Ladeuil
-
Date:
2007-03-14 10:37:18 UTC
-
mto:
(1551.12.56 mergedirective-fixes)
-
mto:
This revision was merged to the branch mainline in
revision
2359.
-
Revision ID:
v.ladeuil+lp@free.fr-20070314103718-zg7lmw9jc584l1xd
Fix bug #92195.
* tests/blackbox/test_merge_directive.py:
(TestMergeDirective.prepare_merge_directive): Set smtp_server in
branch config.
(TestMergeDirective.test_mail): Check that the smtp_server is
taken into account.
* builtins.py:
(cmd_merge_directive.run): Provide config smtp_server to
SMTP.connect().