Commit a96d2298 authored by Andrey Vagin's avatar Andrey Vagin Committed by Andrei Vagin

test/inhfd: fix lint warnings

Signed-off-by: 's avatarAndrei Vagin <avagin@virtuozzo.com>
Signed-off-by: 's avatarAndrei Vagin <avagin@gmail.com>
parent d13ff7e3
import os, tempfile import os
import tempfile
id_str = "" id_str = ""
def create_fds(): def create_fds():
tdir = tempfile.mkdtemp("zdtm.inhfd.XXXXXX") tdir = tempfile.mkdtemp("zdtm.inhfd.XXXXXX")
if os.system("mount -t tmpfs zdtm.inhfd %s" % tdir) != 0: if os.system("mount -t tmpfs zdtm.inhfd %s" % tdir) != 0:
...@@ -15,10 +17,10 @@ def create_fds(): ...@@ -15,10 +17,10 @@ def create_fds():
mnt_id = -1 mnt_id = -1
with open("/proc/self/fdinfo/%d" % fd1.fileno()) as f: with open("/proc/self/fdinfo/%d" % fd1.fileno()) as f:
for l in f: for line in f:
l = l.split() line = line.split()
if l[0] == "mnt_id:": if line[0] == "mnt_id:":
mnt_id = int(l[1]) mnt_id = int(line[1])
break break
else: else:
raise Exception("Unable to find mnt_id") raise Exception("Unable to find mnt_id")
...@@ -28,8 +30,10 @@ def create_fds(): ...@@ -28,8 +30,10 @@ def create_fds():
return (fd2, fd1) return (fd2, fd1)
def filename(pipef): def filename(pipef):
return id_str return id_str
def dump_opts(sockf): def dump_opts(sockf):
return [ "--external", id_str ] return ["--external", id_str]
import os import os
def create_fds(): def create_fds():
(fd1, fd2) = os.pipe() (fd1, fd2) = os.pipe()
return (os.fdopen(fd2, "wb"), os.fdopen(fd1, "rb")) return (os.fdopen(fd2, "wb"), os.fdopen(fd1, "rb"))
def filename(pipef): def filename(pipef):
return 'pipe:[%d]' % os.fstat(pipef.fileno()).st_ino return 'pipe:[%d]' % os.fstat(pipef.fileno()).st_ino
def dump_opts(sockf): def dump_opts(sockf):
return [ ] return []
import socket import socket
import os import os
def create_fds(): def create_fds():
(sk1, sk2) = socket.socketpair(socket.AF_UNIX, socket.SOCK_STREAM) (sk1, sk2) = socket.socketpair(socket.AF_UNIX, socket.SOCK_STREAM)
return (sk1.makefile("wb"), sk2.makefile("rb")) return (sk1.makefile("wb"), sk2.makefile("rb"))
def __sock_ino(sockf): def __sock_ino(sockf):
return os.fstat(sockf.fileno()).st_ino return os.fstat(sockf.fileno()).st_ino
def filename(sockf): def filename(sockf):
return 'socket:[%d]' % __sock_ino(sockf) return 'socket:[%d]' % __sock_ino(sockf)
def dump_opts(sockf): def dump_opts(sockf):
return ['--external', 'unix[%d]' % __sock_ino(sockf)] return ['--external', 'unix[%d]' % __sock_ino(sockf)]
import os, pty import fcntl
import termios, fcntl import os
import pty
import termios
def child_prep(fd): def child_prep(fd):
fcntl.ioctl(fd.fileno(), termios.TIOCSCTTY, 1) fcntl.ioctl(fd.fileno(), termios.TIOCSCTTY, 1)
def create_fds(): def create_fds():
(fd1, fd2) = pty.openpty() (fd1, fd2) = pty.openpty()
return (os.fdopen(fd2, "wb"), os.fdopen(fd1, "rb")) return (os.fdopen(fd2, "wb"), os.fdopen(fd1, "rb"))
def filename(pipef): def filename(pipef):
st = os.fstat(pipef.fileno()) st = os.fstat(pipef.fileno())
return 'tty[%x:%x]' % (st.st_rdev, st.st_dev) return 'tty[%x:%x]' % (st.st_rdev, st.st_dev)
def dump_opts(sockf): def dump_opts(sockf):
st = os.fstat(sockf.fileno()) st = os.fstat(sockf.fileno())
return ["--external", 'tty[%x:%x]' % (st.st_rdev, st.st_dev)] return ["--external", 'tty[%x:%x]' % (st.st_rdev, st.st_dev)]
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment