mirror of
https://github.com/facebook/sapling.git
synced 2024-10-11 17:27:53 +03:00
9dc21f8d0b
Summary: D13853115 adds `edenscm/` to `sys.path` and code still uses `import mercurial`. That has nasty problems if both `import mercurial` and `import edenscm.mercurial` are used, because Python would think `mercurial.foo` and `edenscm.mercurial.foo` are different modules so code like `try: ... except mercurial.error.Foo: ...`, or `isinstance(x, mercurial.foo.Bar)` would fail to handle the `edenscm.mercurial` version. There are also some module-level states (ex. `extensions._extensions`) that would cause trouble if they have multiple versions in a single process. Change imports to use the `edenscm` so ideally the `mercurial` is no longer imported at all. Add checks in extensions.py to catch unexpected extensions importing modules from the old (wrong) locations when running tests. Reviewed By: phillco Differential Revision: D13868981 fbshipit-source-id: f4e2513766957fd81d85407994f7521a08e4de48
90 lines
2.3 KiB
Python
Executable File
90 lines
2.3 KiB
Python
Executable File
#!/usr/bin/env python
|
|
|
|
"""dummy SMTP server for use in tests"""
|
|
|
|
from __future__ import absolute_import
|
|
|
|
import asyncore
|
|
import optparse
|
|
import smtpd
|
|
import ssl
|
|
import sys
|
|
|
|
from edenscm.mercurial import server, sslutil, ui as uimod
|
|
|
|
|
|
def log(msg):
|
|
sys.stdout.write(msg)
|
|
sys.stdout.flush()
|
|
|
|
|
|
class dummysmtpserver(smtpd.SMTPServer):
|
|
def __init__(self, localaddr):
|
|
smtpd.SMTPServer.__init__(self, localaddr, remoteaddr=None)
|
|
|
|
def process_message(self, peer, mailfrom, rcpttos, data):
|
|
log("%s from=%s to=%s\n" % (peer[0], mailfrom, ", ".join(rcpttos)))
|
|
|
|
|
|
class dummysmtpsecureserver(dummysmtpserver):
|
|
def __init__(self, localaddr, certfile):
|
|
dummysmtpserver.__init__(self, localaddr)
|
|
self._certfile = certfile
|
|
|
|
def handle_accept(self):
|
|
pair = self.accept()
|
|
if not pair:
|
|
return
|
|
conn, addr = pair
|
|
ui = uimod.ui.load()
|
|
try:
|
|
# wrap_socket() would block, but we don't care
|
|
conn = sslutil.wrapserversocket(conn, ui, certfile=self._certfile)
|
|
except ssl.SSLError:
|
|
log("%s ssl error\n" % addr[0])
|
|
conn.close()
|
|
return
|
|
smtpd.SMTPChannel(self, conn, addr)
|
|
|
|
|
|
def run():
|
|
try:
|
|
asyncore.loop()
|
|
except KeyboardInterrupt:
|
|
pass
|
|
|
|
|
|
def main():
|
|
op = optparse.OptionParser()
|
|
op.add_option("-d", "--daemon", action="store_true")
|
|
op.add_option("--daemon-postexec", action="append")
|
|
op.add_option("-p", "--port", type=int, default=8025)
|
|
op.add_option("-a", "--address", default="localhost")
|
|
op.add_option("--pid-file", metavar="FILE")
|
|
op.add_option("--tls", choices=["none", "smtps"], default="none")
|
|
op.add_option("--certificate", metavar="FILE")
|
|
|
|
opts, args = op.parse_args()
|
|
if opts.tls == "smtps" and not opts.certificate:
|
|
op.error("--certificate must be specified")
|
|
|
|
addr = (opts.address, opts.port)
|
|
|
|
def init():
|
|
if opts.tls == "none":
|
|
dummysmtpserver(addr)
|
|
else:
|
|
dummysmtpsecureserver(addr, opts.certificate)
|
|
log("listening at %s:%d\n" % addr)
|
|
|
|
server.runservice(
|
|
vars(opts),
|
|
initfn=init,
|
|
runfn=run,
|
|
runargs=[sys.executable, __file__] + sys.argv[1:],
|
|
)
|
|
|
|
|
|
if __name__ == "__main__":
|
|
main()
|