Rev 2340: (Marien Zwart) Override smtplib.connect so we don't require smtpd to be running. in /home/pqm/archives/thelove/bzr/+trunk/

[Canonical.com Patch Queue Manager]

------------------------------------------------------------
revno: 2340
revision-id: pqm at pqm.ubuntu.com-20070312161518-2706316ad769b56a
parent: pqm at pqm.ubuntu.com-20070312154217-b0cd137fae2a67d8
parent: john at arbash-meinel.com-20070312155604-ce341jry03f4w58m
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Mon 2007-03-12 16:15:18 +0000
message:
  (Marien Zwart) Override smtplib.connect so we don't require smtpd to be running.
modified:
  bzrlib/tests/blackbox/test_merge_directive.py test_merge_directive-20070302012039-zh7uhy39biairtn0-1
    ------------------------------------------------------------
    merged: john at arbash-meinel.com-20070312155604-ce341jry03f4w58m
    parent: pqm at pqm.ubuntu.com-20070312154217-b0cd137fae2a67d8
    parent: marienz at gentoo.org-20070312034818-vxuaptp67gfiv8ym
    committer: John Arbash Meinel <john at arbash-meinel.com>
    branch nick: jam-integration
    timestamp: Mon 2007-03-12 09:56:04 -0600
    message:
      (Marien Zwart) Override smtplib.connect so we don't require smtpd to be running.
    ------------------------------------------------------------
    merged: marienz at gentoo.org-20070312034818-vxuaptp67gfiv8ym
    parent: pqm at pqm.ubuntu.com-20070311211206-0fd0176ac1e77ef7
    committer: Marien Zwart <marienz at gentoo.org>
    branch nick: bzr-mail-test
    timestamp: Mon 2007-03-12 04:48:18 +0100
    message:
      Make the merge directive tests work if there is no smtpd running on localhost.