mirror of
https://github.com/facebook/sapling.git
synced 2024-10-12 01:39:21 +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
29 lines
727 B
Python
29 lines
727 B
Python
import os
|
|
import sys
|
|
|
|
# Make sure we use sshaskpass.py in this repo, unaffected by PYTHONPATH
|
|
from edenscm.hgext import sshaskpass
|
|
|
|
|
|
# stdin, stderr have to be tty to run test
|
|
pid, master = os.forkpty()
|
|
if pid:
|
|
# parent, test some I/O
|
|
os.write(master, "(input)\n")
|
|
with os.fdopen(master, "r") as f:
|
|
sys.stdout.write("pty receives: %r" % f.read())
|
|
os.waitpid(pid, 0)
|
|
sys.exit(0)
|
|
|
|
# child, start a ttyserver and do some I/O
|
|
ttysrvpid, sockpath = sshaskpass._startttyserver()
|
|
|
|
try:
|
|
r, w = sshaskpass._receivefds(sockpath)
|
|
with os.fdopen(r) as f:
|
|
line = f.readline()
|
|
os.write(w, "client receives: " + line)
|
|
finally:
|
|
sshaskpass._killprocess(ttysrvpid)
|
|
os.unlink(sockpath)
|