Ok, I have made minor remarks for the first version of this module http://codereview.appspot.com/79042/diff/1/4 and Michael either commented or addressed the questions. I am going to commit this new module. Thanks for your work, Michael! On Mon, Jul 20, 2009 at 12:07 PM, Michael Goldish<mgoldish@xxxxxxxxxx> wrote: > This module is intended to be used for controlling all child processes in KVM > tests: both QEMU processes and SSH/SCP/Telnet processes. Processes started with > this module keep running and can be interacted with even after the parent > process exits. > > The current run_bg() utility tracks a child process as long as the parent > process is running. When the parent process exits, the tracking thread > terminates and cannot resume when needed. > > Currently SSH/SCP/Telnet communication is handled by kvm_utils.kvm_spawn, which > does not allow the child process to run after the parent process exits. Thus, > open SSH/SCP/Telnet sessions cannot be reused by tests following the one in > which they are opened. > > The new module provides a solution to these two problems, and also saves some > code by reusing common code required both for QEMU processes and SSH/SCP/Telnet > processes. > > Signed-off-by: Michael Goldish <mgoldish@xxxxxxxxxx> > --- > client/tests/kvm/kvm_subprocess.py | 1146 ++++++++++++++++++++++++++++++++++++ > 1 files changed, 1146 insertions(+), 0 deletions(-) > create mode 100644 client/tests/kvm/kvm_subprocess.py > > diff --git a/client/tests/kvm/kvm_subprocess.py b/client/tests/kvm/kvm_subprocess.py > new file mode 100644 > index 0000000..413bdaa > --- /dev/null > +++ b/client/tests/kvm/kvm_subprocess.py > @@ -0,0 +1,1146 @@ > +#!/usr/bin/python > +import sys, subprocess, pty, select, os, time, signal, re, termios, fcntl > +import threading, logging, commands > +import common, kvm_utils > + > +""" > +A class and functions used for running and controlling child processes. > + > +@copyright: 2008-2009 Red Hat Inc. > +""" > + > + > +def run_bg(command, termination_func=None, output_func=None, output_prefix="", > + timeout=1.0): > + """ > + Run command as a subprocess. Call output_func with each line of output > + from the subprocess (prefixed by output_prefix). Call termination_func > + when the subprocess terminates. Return when timeout expires or when the > + subprocess exits -- whichever occurs first. > + > + @brief: Run a subprocess in the background and collect its output and > + exit status. > + > + @param command: The shell command to execute > + @param termination_func: A function to call when the process terminates > + (should take an integer exit status parameter) > + @param output_func: A function to call with each line of output from > + the subprocess (should take a string parameter) > + @param output_prefix: A string to pre-pend to each line of the output, > + before passing it to stdout_func > + @param timeout: Time duration (in seconds) to wait for the subprocess to > + terminate before returning > + > + @return: A kvm_tail object. > + """ > + process = kvm_tail(command=command, > + termination_func=termination_func, > + output_func=output_func, > + output_prefix=output_prefix) > + > + end_time = time.time() + timeout > + while time.time() < end_time and process.is_alive(): > + time.sleep(0.1) > + > + return process > + > + > +def run_fg(command, output_func=None, output_prefix="", timeout=1.0): > + """ > + Run command as a subprocess. Call output_func with each line of output > + from the subprocess (prefixed by prefix). Return when timeout expires or > + when the subprocess exits -- whichever occurs first. If timeout expires > + and the subprocess is still running, kill it before returning. > + > + @brief: Run a subprocess in the foreground and collect its output and > + exit status. > + > + @param command: The shell command to execute > + @param output_func: A function to call with each line of output from > + the subprocess (should take a string parameter) > + @param output_prefix: A string to pre-pend to each line of the output, > + before passing it to stdout_func > + @param timeout: Time duration (in seconds) to wait for the subprocess to > + terminate before killing it and returning > + > + @return: A 2-tuple containing the exit status of the process and its > + STDOUT/STDERR output. If timeout expires before the process > + terminates, the returned status is None. > + """ > + process = run_bg(command, None, output_func, output_prefix, timeout) > + output = process.get_output() > + if process.is_alive(): > + status = None > + else: > + status = process.get_status() > + process.close() > + return (status, output) > + > + > +def _lock(filename): > + if not os.path.exists(filename): > + open(filename, "w").close() > + fd = os.open(filename, os.O_RDWR) > + fcntl.lockf(fd, fcntl.LOCK_EX) > + return fd > + > + > +def _unlock(fd): > + fcntl.lockf(fd, fcntl.LOCK_UN) > + os.close(fd) > + > + > +def _locked(filename): > + try: > + fd = os.open(filename, os.O_RDWR) > + except: > + return False > + try: > + fcntl.lockf(fd, fcntl.LOCK_EX | fcntl.LOCK_NB) > + except: > + os.close(fd) > + return True > + fcntl.lockf(fd, fcntl.LOCK_UN) > + os.close(fd) > + return False > + > + > +def _wait(filename): > + fd = _lock(filename) > + _unlock(fd) > + > + > +def _get_filenames(base_dir, id): > + return [os.path.join(base_dir, s + id) for s in > + "shell-pid-", "status-", "output-", "inpipe-", > + "lock-server-running-", "lock-client-starting-"] > + > + > +def _get_reader_filename(base_dir, id, reader): > + return os.path.join(base_dir, "outpipe-%s-%s" % (reader, id)) > + > + > +class kvm_spawn: > + """ > + This class is used for spawning and controlling a child process. > + > + A new instance of this class can either run a new server (a small Python > + program that reads output from the child process and reports it to the > + client and to a text file) or attach to an already running server. > + When a server is started it runs the child process. > + The server writes output from the child's STDOUT and STDERR to a text file. > + The text file can be accessed at any time using get_output(). > + In addition, the server opens as many pipes as requested by the client and > + writes the output to them. > + The pipes are requested and accessed by classes derived from kvm_spawn. > + These pipes are referred to as "readers". > + The server also receives input from the client and sends it to the child > + process. > + An instance of this class can be pickled. Every derived class is > + responsible for restoring its own state by properly defining > + __getinitargs__(). > + > + The first named pipe is used by _tail(), a function that runs in the > + background and reports new output from the child as it is produced. > + The second named pipe is used by a set of functions that read and parse > + output as requested by the user in an interactive manner, similar to > + pexpect. > + When unpickled it automatically > + resumes _tail() if needed. > + """ > + > + def __init__(self, command=None, id=None, echo=False, linesep="\n"): > + """ > + Initialize the class and run command as a child process. > + > + @param command: Command to run, or None if accessing an already running > + server. > + @param id: ID of an already running server, if accessing a running > + server, or None if starting a new one. > + @param echo: Boolean indicating whether echo should be initially > + enabled for the pseudo terminal running the subprocess. This > + parameter has an effect only when starting a new server. > + @param linesep: Line separator to be appended to strings sent to the > + child process by sendline(). > + """ > + self.id = id or kvm_utils.generate_random_string(8) > + > + # Define filenames for communication with server > + base_dir = "/tmp/kvm_spawn" > + try: > + os.makedirs(base_dir) > + except: > + pass > + (self.shell_pid_filename, > + self.status_filename, > + self.output_filename, > + self.inpipe_filename, > + self.lock_server_running_filename, > + self.lock_client_starting_filename) = _get_filenames(base_dir, > + self.id) > + > + # Remember some attributes > + self.echo = echo > + self.linesep = linesep > + > + # Make sure the 'readers' and 'close_hooks' attributes exist > + if not hasattr(self, "readers"): > + self.readers = [] > + if not hasattr(self, "close_hooks"): > + self.close_hooks = [] > + > + # Define the reader filenames > + self.reader_filenames = dict( > + (reader, _get_reader_filename(base_dir, self.id, reader)) > + for reader in self.readers) > + > + # Let the server know a client intends to open some pipes; > + # if the executed command terminates quickly, the server will wait for > + # the client to release the lock before exiting > + lock_client_starting = _lock(self.lock_client_starting_filename) > + > + # Start the server (which runs the command) > + if command: > + sub = subprocess.Popen("python %s" % __file__, > + shell=True, > + stdin=subprocess.PIPE, > + stdout=subprocess.PIPE, > + stderr=subprocess.STDOUT) > + # Send parameters to the server > + sub.stdin.write("%s\n" % self.id) > + sub.stdin.write("%s\n" % echo) > + sub.stdin.write("%s\n" % ",".join(self.readers)) > + sub.stdin.write("%s\n" % command) > + # Wait for the server to complete its initialization > + sub.stdout.readline() > + > + # Open the reading pipes > + self.reader_fds = {} > + try: > + assert(_locked(self.lock_server_running_filename)) > + for reader, filename in self.reader_filenames.items(): > + self.reader_fds[reader] = os.open(filename, os.O_RDONLY) > + except: > + pass > + > + # Allow the server to continue > + _unlock(lock_client_starting) > + > + > + # The following two functions are defined to make sure the state is set > + # exclusively by the constructor call as specified in __getinitargs__(). > + > + def __getstate__(self): > + pass > + > + > + def __setstate__(self, state): > + pass > + > + > + def __getinitargs__(self): > + # Save some information when pickling -- will be passed to the > + # constructor upon unpickling > + return (None, self.id, self.echo, self.linesep) > + > + > + def _add_reader(self, reader): > + """ > + Add a reader whose file descriptor can be obtained with _get_fd(). > + Should be called before __init__(). Intended for use by derived > + classes. > + > + @param reader: The name of the reader. > + """ > + if not hasattr(self, "readers"): > + self.readers = [] > + self.readers.append(reader) > + > + > + def _add_close_hook(self, hook): > + """ > + Add a close hook function to be called when close() is called. > + The function will be called after the process terminates but before > + final cleanup. Intended for use by derived classes. > + > + @param hook: The hook function. > + """ > + if not hasattr(self, "close_hooks"): > + self.close_hooks = [] > + self.close_hooks.append(hook) > + > + > + def _get_fd(self, reader): > + """ > + Return an open file descriptor corresponding to the specified reader > + pipe. If no such reader exists, or the pipe could not be opened, > + return None. Intended for use by derived classes. > + > + @param reader: The name of the reader. > + """ > + return self.reader_fds.get(reader) > + > + > + def get_id(self): > + """ > + Return the instance's id attribute, which may be used to access the > + process in the future. > + """ > + return self.id > + > + > + def get_shell_pid(self): > + """ > + Return the PID of the subshell process, or None if not available. > + The subshell is the shell that runs the command. > + """ > + try: > + file = open(self.shell_pid_filename, "r") > + pid = int(file.read()) > + file.close() > + return pid > + except: > + return None > + > + > + def get_pid(self, index=0): > + """ > + Try to get and return the PID of a child process of the subshell. > + This is usually the PID of the process executed in the subshell. > + There are 3 exceptions: > + - If the subshell couldn't start the process for some reason, no > + PID can be returned. > + - If the subshell is running several processes in parallel, > + multiple PIDs can be returned. Use the index parameter in this > + case. > + - Before starting the process, after the process has terminated, > + or while running shell code that doesn't start any processes -- > + no PID can be returned. > + > + @param index: The index of the child process whose PID is requested. > + Normally this should remain 0. > + @return: The PID of the child process, or None if none could be found. > + """ > + parent_pid = self.get_shell_pid() > + if not parent_pid: > + return None > + pids = commands.getoutput("ps --ppid %d -o pid=" % parent_pid).split() > + try: > + return int(pids[index]) > + except: > + return None > + > + > + def get_status(self): > + """ > + Wait for the process to exit and return its exit status, or None > + if the exit status is not available. > + """ > + _wait(self.lock_server_running_filename) > + try: > + file = open(self.status_filename, "r") > + status = int(file.read()) > + file.close() > + return status > + except: > + return None > + > + > + def get_output(self): > + """ > + Return the STDOUT and STDERR output of the process so far. > + """ > + try: > + file = open(self.output_filename, "r") > + output = file.read() > + file.close() > + return output > + except: > + return "" > + > + > + def is_alive(self): > + """ > + Return True if the process is running. > + """ > + pid = self.get_shell_pid() > + # See if the PID exists > + try: > + os.kill(pid, 0) > + except: > + return False > + # Make sure the PID belongs to the original process > + filename = "/proc/%d/cmdline" % pid > + try: > + file = open(filename, "r") > + cmdline = file.read() > + file.close() > + except: > + # If we couldn't find the file for some reason, skip the check > + return True > + if self.id in cmdline: > + return True > + return False > + > + > + def close(self, sig=signal.SIGTERM): > + """ > + Kill the child process if it's alive and remove temporary files. > + > + @param sig: The signal to send the process when attempting to kill it. > + """ > + # Kill it if it's alive > + if self.is_alive(): > + try: > + os.kill(self.get_shell_pid(), sig) > + except: > + pass > + # Wait for the server to exit > + _wait(self.lock_server_running_filename) > + # Call all cleanup routines > + for hook in self.close_hooks: > + hook() > + # Close reader file descriptors > + for fd in self.reader_fds.values(): > + try: > + os.close(fd) > + except: > + pass > + # Remove all used files > + for filename in (_get_filenames("/tmp/kvm_spawn", self.id) + > + self.reader_filenames.values()): > + try: > + os.unlink(filename) > + except OSError: > + pass > + > + > + def set_linesep(self, linesep): > + """ > + Sets the line separator string (usually "\\n"). > + > + @param linesep: Line separator string. > + """ > + self.linesep = linesep > + > + > + def send(self, str=""): > + """ > + Send a string to the child process. > + > + @param str: String to send to the child process. > + """ > + try: > + fd = os.open(self.inpipe_filename, os.O_RDWR) > + os.write(fd, str) > + os.close(fd) > + except: > + pass > + > + > + def sendline(self, str=""): > + """ > + Send a string followed by a line separator to the child process. > + > + @param str: String to send to the child process. > + """ > + self.send(str + self.linesep) > + > + > +class kvm_tail(kvm_spawn): > + """ > + This class runs a child process in the background and sends its output in > + real time, line-by-line, to a callback function. > + > + See kvm_spawn's docstring. > + > + This class uses a single pipe reader to read data in real time from the > + child process and report it to a given callback function. > + When the child process exits, its exit status is reported to an additional > + callback function. > + > + When this class is unpickled, it automatically resumes reporting output. > + """ > + > + def __init__(self, command=None, id=None, echo=False, linesep="\n", > + termination_func=None, output_func=None, output_prefix=""): > + """ > + Initialize the class and run command as a child process. > + > + @param command: Command to run, or None if accessing an already running > + server. > + @param id: ID of an already running server, if accessing a running > + server, or None if starting a new one. > + @param echo: Boolean indicating whether echo should be initially > + enabled for the pseudo terminal running the subprocess. This > + parameter has an effect only when starting a new server. > + @param linesep: Line separator to be appended to strings sent to the > + child process by sendline(). > + @param termination_func: Function to call when the process exits. The > + function must accept a single exit status parameter. > + @param output_func: Function to call whenever a line of output is > + available from the STDOUT or STDERR streams of the process. > + The function must accept a single string parameter. The string > + does not include the final newline. > + @param output_prefix: String to prepend to lines sent to output_func. > + """ > + # Add a reader and a close hook > + self._add_reader("tail") > + self._add_close_hook(self._join_thread) > + > + # Init the superclass > + kvm_spawn.__init__(self, command, id, echo, linesep) > + > + # Remember some attributes > + self.termination_func = termination_func > + self.output_func = output_func > + self.output_prefix = output_prefix > + > + # Start the thread in the background > + self.tail_thread = threading.Thread(None, self._tail) > + self.tail_thread.start() > + > + > + def __getinitargs__(self): > + return kvm_spawn.__getinitargs__(self) + (self.termination_func, > + self.output_func, > + self.output_prefix) > + > + > + def set_termination_func(self, termination_func): > + """ > + Set the termination_func attribute. See __init__() for details. > + > + @param termination_func: Function to call when the process terminates. > + Must take a single parameter -- the exit status. > + """ > + self.termination_func = termination_func > + > + > + def set_output_func(self, output_func): > + """ > + Set the output_func attribute. See __init__() for details. > + > + @param output_func: Function to call for each line of STDOUT/STDERR > + output from the process. Must take a single string parameter. > + """ > + self.output_func = output_func > + > + > + def set_output_prefix(self, output_prefix): > + """ > + Set the output_prefix attribute. See __init__() for details. > + > + @param output_prefix: String to pre-pend to each line sent to > + output_func (see set_output_callback()). > + """ > + self.output_prefix = output_prefix > + > + > + def _tail(self): > + def print_line(text): > + # Pre-pend prefix and remove trailing whitespace > + text = self.output_prefix + text.rstrip() > + # Sanitize text > + text = text.decode("utf-8", "replace") > + # Pass it to output_func > + try: > + self.output_func(text) > + except TypeError: > + pass > + > + fd = self._get_fd("tail") > + buffer = "" > + while True: > + try: > + # See if there's any data to read from the pipe > + r, w, x = select.select([fd], [], [], 0.05) > + except: > + break > + if fd in r: > + # Some data is available; read it > + new_data = os.read(fd, 1024) > + if not new_data: > + break > + buffer += new_data > + # Send the output to output_func line by line > + # (except for the last line) > + if self.output_func: > + lines = buffer.split("\n") > + for line in lines[:-1]: > + print_line(line) > + # Leave only the last line > + last_newline_index = buffer.rfind("\n") > + buffer = buffer[last_newline_index+1:] > + else: > + # No output is available right now; flush the buffer > + if buffer: > + print_line(buffer) > + buffer = "" > + # The process terminated; print any remaining output > + if buffer: > + print_line(buffer) > + # Get the exit status, print it and send it to termination_func > + status = self.get_status() > + if status is None: > + return > + print_line("(Process terminated with status %s)" % status) > + try: > + self.termination_func(status) > + except TypeError: > + pass > + > + > + def _join_thread(self): > + # Wait for the tail thread to exit > + if self.tail_thread: > + self.tail_thread.join() > + > + > +class kvm_expect(kvm_tail): > + """ > + This class runs a child process in the background and provides expect-like > + services. > + > + It also provides all of kvm_tail's functionality. > + """ > + > + def __init__(self, command=None, id=None, echo=False, linesep="\n", > + termination_func=None, output_func=None, output_prefix=""): > + """ > + Initialize the class and run command as a child process. > + > + @param command: Command to run, or None if accessing an already running > + server. > + @param id: ID of an already running server, if accessing a running > + server, or None if starting a new one. > + @param echo: Boolean indicating whether echo should be initially > + enabled for the pseudo terminal running the subprocess. This > + parameter has an effect only when starting a new server. > + @param linesep: Line separator to be appended to strings sent to the > + child process by sendline(). > + @param termination_func: Function to call when the process exits. The > + function must accept a single exit status parameter. > + @param output_func: Function to call whenever a line of output is > + available from the STDOUT or STDERR streams of the process. > + The function must accept a single string parameter. The string > + does not include the final newline. > + @param output_prefix: String to prepend to lines sent to output_func. > + """ > + # Add a reader > + self._add_reader("expect") > + > + # Init the superclass > + kvm_tail.__init__(self, command, id, echo, linesep, > + termination_func, output_func, output_prefix) > + > + > + def __getinitargs__(self): > + return kvm_tail.__getinitargs__(self) > + > + > + def read_nonblocking(self, timeout=None): > + """ > + Read from child until there is nothing to read for timeout seconds. > + > + @param timeout: Time (seconds) to wait before we give up reading from > + the child process, or None to use the default value. > + """ > + if timeout is None: > + timeout = 0.1 > + fd = self._get_fd("expect") > + data = "" > + while True: > + try: > + r, w, x = select.select([fd], [], [], timeout) > + except: > + return data > + if fd in r: > + new_data = os.read(fd, 1024) > + if not new_data: > + return data > + data += new_data > + else: > + return data > + > + > + def match_patterns(self, str, patterns): > + """ > + Match str against a list of patterns. > + > + Return the index of the first pattern that matches a substring of str. > + None and empty strings in patterns are ignored. > + If no match is found, return None. > + > + @param patterns: List of strings (regular expression patterns). > + """ > + for i in range(len(patterns)): > + if not patterns[i]: > + continue > + if re.search(patterns[i], str): > + return i > + > + > + def read_until_output_matches(self, patterns, filter=lambda x: x, > + timeout=30.0, internal_timeout=None, > + print_func=None): > + """ > + Read using read_nonblocking until a match is found using match_patterns, > + or until timeout expires. Before attempting to search for a match, the > + data is filtered using the filter function provided. > + > + @brief: Read from child using read_nonblocking until a pattern > + matches. > + @param patterns: List of strings (regular expression patterns) > + @param filter: Function to apply to the data read from the child before > + attempting to match it against the patterns (should take and > + return a string) > + @param timeout: The duration (in seconds) to wait until a match is > + found > + @param internal_timeout: The timeout to pass to read_nonblocking > + @param print_func: A function to be used to print the data being read > + (should take a string parameter) > + @return: Tuple containing the match index (or None if no match was > + found) and the data read so far. > + """ > + match = None > + data = "" > + > + end_time = time.time() + timeout > + while time.time() < end_time: > + # Read data from child > + newdata = self.read_nonblocking(internal_timeout) > + # Print it if necessary > + if print_func and newdata: > + str = newdata > + if str.endswith("\n"): > + str = str[:-1] > + for line in str.split("\n"): > + print_func(line.decode("utf-8", "replace")) > + data += newdata > + > + done = False > + # Look for patterns > + match = self.match_patterns(filter(data), patterns) > + if match is not None: > + done = True > + # Check if child has died > + if not self.is_alive(): > + logging.debug("Process terminated with status %s" % self.get_status()) > + done = True > + # Are we done? > + if done: break > + > + # Print some debugging info > + if match is None and (self.is_alive() or self.get_status() != 0): > + logging.debug("Timeout elapsed or process terminated. Output:" + > + kvm_utils.format_str_for_message(data.strip())) > + > + return (match, data) > + > + > + def read_until_last_word_matches(self, patterns, timeout=30.0, > + internal_timeout=None, print_func=None): > + """ > + Read using read_nonblocking until the last word of the output matches > + one of the patterns (using match_patterns), or until timeout expires. > + > + @param patterns: A list of strings (regular expression patterns) > + @param timeout: The duration (in seconds) to wait until a match is > + found > + @param internal_timeout: The timeout to pass to read_nonblocking > + @param print_func: A function to be used to print the data being read > + (should take a string parameter) > + @return: A tuple containing the match index (or None if no match was > + found) and the data read so far. > + """ > + def get_last_word(str): > + if str: > + return str.split()[-1] > + else: > + return "" > + > + return self.read_until_output_matches(patterns, get_last_word, > + timeout, internal_timeout, > + print_func) > + > + > + def read_until_last_line_matches(self, patterns, timeout=30.0, > + internal_timeout=None, print_func=None): > + """ > + Read using read_nonblocking until the last non-empty line of the output > + matches one of the patterns (using match_patterns), or until timeout > + expires. Return a tuple containing the match index (or None if no match > + was found) and the data read so far. > + > + @brief: Read using read_nonblocking until the last non-empty line > + matches a pattern. > + > + @param patterns: A list of strings (regular expression patterns) > + @param timeout: The duration (in seconds) to wait until a match is > + found > + @param internal_timeout: The timeout to pass to read_nonblocking > + @param print_func: A function to be used to print the data being read > + (should take a string parameter) > + """ > + def get_last_nonempty_line(str): > + nonempty_lines = [l for l in str.splitlines() if l.strip()] > + if nonempty_lines: > + return nonempty_lines[-1] > + else: > + return "" > + > + return self.read_until_output_matches(patterns, get_last_nonempty_line, > + timeout, internal_timeout, > + print_func) > + > + > +class kvm_shell_session(kvm_expect): > + """ > + This class runs a child process in the background. It it suited for > + processes that provide an interactive shell, such as SSH and Telnet. > + > + It provides all services of kvm_expect and kvm_tail. In addition, it > + provides command running services, and a utility function to test the > + process for responsiveness. > + """ > + > + def __init__(self, command=None, id=None, echo=False, linesep="\n", > + termination_func=None, output_func=None, output_prefix="", > + prompt=r"[\#\$]\s*$", status_test_command="echo $?"): > + """ > + Initialize the class and run command as a child process. > + > + @param command: Command to run, or None if accessing an already running > + server. > + @param id: ID of an already running server, if accessing a running > + server, or None if starting a new one. > + @param echo: Boolean indicating whether echo should be initially > + enabled for the pseudo terminal running the subprocess. This > + parameter has an effect only when starting a new server. > + @param linesep: Line separator to be appended to strings sent to the > + child process by sendline(). > + @param termination_func: Function to call when the process exits. The > + function must accept a single exit status parameter. > + @param output_func: Function to call whenever a line of output is > + available from the STDOUT or STDERR streams of the process. > + The function must accept a single string parameter. The string > + does not include the final newline. > + @param output_prefix: String to prepend to lines sent to output_func. > + @param prompt: Regular expression describing the shell's prompt line. > + @param status_test_command: Command to be used for getting the last > + exit status of commands run inside the shell (used by > + get_command_status_output() and friends). > + """ > + # Init the superclass > + kvm_expect.__init__(self, command, id, echo, linesep, > + termination_func, output_func, output_prefix) > + > + # Remember some attributes > + self.prompt = prompt > + self.status_test_command = status_test_command > + > + > + def __getinitargs__(self): > + return kvm_expect.__getinitargs__(self) + (self.prompt, > + self.status_test_command) > + > + > + def set_prompt(self, prompt): > + """ > + Set the prompt attribute for later use by read_up_to_prompt. > + > + @param: String that describes the prompt contents. > + """ > + self.prompt = prompt > + > + > + def set_status_test_command(self, status_test_command): > + """ > + Set the command to be sent in order to get the last exit status. > + > + @param status_test_command: Command that will be sent to get the last > + exit status. > + """ > + self.status_test_command = status_test_command > + > + > + def is_responsive(self, timeout=5.0): > + """ > + Return True if the process responds to STDIN/terminal input. > + > + Send a newline to the child process (e.g. SSH or Telnet) and read some > + output using read_nonblocking(). > + If all is OK, some output should be available (e.g. the shell prompt). > + In that case return True. Otherwise return False. > + > + @param timeout: Time duration to wait before the process is considered > + unresponsive. > + """ > + # Read all output that's waiting to be read, to make sure the output > + # we read next is in response to the newline sent > + self.read_nonblocking(timeout=0.1) > + # Send a newline > + self.sendline() > + # Wait up to timeout seconds for some output from the child > + end_time = time.time() + timeout > + while time.time() < end_time: > + time.sleep(0.5) > + if self.read_nonblocking(timeout=0).strip(): > + return True > + # No output -- report unresponsive > + return False > + > + > + def read_up_to_prompt(self, timeout=30.0, internal_timeout=None, > + print_func=None): > + """ > + Read using read_nonblocking until the last non-empty line of the output > + matches the prompt regular expression set by set_prompt, or until > + timeout expires. > + > + @brief: Read using read_nonblocking until the last non-empty line > + matches the prompt. > + > + @param timeout: The duration (in seconds) to wait until a match is > + found > + @param internal_timeout: The timeout to pass to read_nonblocking > + @param print_func: A function to be used to print the data being > + read (should take a string parameter) > + > + @return: A tuple containing True/False indicating whether the prompt > + was found, and the data read so far. > + """ > + (match, output) = self.read_until_last_line_matches([self.prompt], > + timeout, > + internal_timeout, > + print_func) > + return (match is not None, output) > + > + > + def get_command_status_output(self, command, timeout=30.0, > + internal_timeout=None, print_func=None): > + """ > + Send a command and return its exit status and output. > + > + @param command: Command to send (must not contain newline characters) > + @param timeout: The duration (in seconds) to wait until a match is > + found > + @param internal_timeout: The timeout to pass to read_nonblocking > + @param print_func: A function to be used to print the data being read > + (should take a string parameter) > + > + @return: A tuple (status, output) where status is the exit status or > + None if no exit status is available (e.g. timeout elapsed), and > + output is the output of command. > + """ > + def remove_command_echo(str, cmd): > + if str and str.splitlines()[0] == cmd: > + str = "".join(str.splitlines(True)[1:]) > + return str > + > + def remove_last_nonempty_line(str): > + return "".join(str.rstrip().splitlines(True)[:-1]) > + > + # Print some debugging info > + logging.debug("Sending command: %s" % command) > + > + # Read everything that's waiting to be read > + self.read_nonblocking(0.1) > + > + # Send the command and get its output > + self.sendline(command) > + (match, output) = self.read_up_to_prompt(timeout, internal_timeout, > + print_func) > + # Remove the echoed command from the output > + output = remove_command_echo(output, command) > + # If the prompt was not found, return the output so far > + if not match: > + return (None, output) > + # Remove the final shell prompt from the output > + output = remove_last_nonempty_line(output) > + > + # Send the 'echo ...' command to get the last exit status > + self.sendline(self.status_test_command) > + (match, status) = self.read_up_to_prompt(10.0, internal_timeout) > + if not match: > + return (None, output) > + status = remove_command_echo(status, self.status_test_command) > + status = remove_last_nonempty_line(status) > + # Get the first line consisting of digits only > + digit_lines = [l for l in status.splitlines() if l.strip().isdigit()] > + if not digit_lines: > + return (None, output) > + status = int(digit_lines[0].strip()) > + > + # Print some debugging info > + if status != 0: > + logging.debug("Command failed; status: %d, output:%s", status, > + kvm_utils.format_str_for_message(output.strip())) > + > + return (status, output) > + > + > + def get_command_status(self, command, timeout=30.0, internal_timeout=None, > + print_func=None): > + """ > + Send a command and return its exit status. > + > + @param command: Command to send > + @param timeout: The duration (in seconds) to wait until a match is > + found > + @param internal_timeout: The timeout to pass to read_nonblocking > + @param print_func: A function to be used to print the data being read > + (should take a string parameter) > + > + @return: Exit status or None if no exit status is available (e.g. > + timeout elapsed). > + """ > + (status, output) = self.get_command_status_output(command, timeout, > + internal_timeout, > + print_func) > + return status > + > + > + def get_command_output(self, command, timeout=30.0, internal_timeout=None, > + print_func=None): > + """ > + Send a command and return its output. > + > + @param command: Command to send > + @param timeout: The duration (in seconds) to wait until a match is > + found > + @param internal_timeout: The timeout to pass to read_nonblocking > + @param print_func: A function to be used to print the data being read > + (should take a string parameter) > + """ > + (status, output) = self.get_command_status_output(command, timeout, > + internal_timeout, > + print_func) > + return output > + > + > +# The following is the server part of the module. > + > +def _server_main(): > + id = sys.stdin.readline().strip() > + echo = sys.stdin.readline().strip() == "True" > + readers = sys.stdin.readline().strip().split(",") > + command = sys.stdin.readline().strip() + " && echo %s > /dev/null" % id > + > + # Define filenames to be used for communication > + base_dir = "/tmp/kvm_spawn" > + (shell_pid_filename, > + status_filename, > + output_filename, > + inpipe_filename, > + lock_server_running_filename, > + lock_client_starting_filename) = _get_filenames(base_dir, id) > + > + # Populate the reader filenames list > + reader_filenames = [_get_reader_filename(base_dir, id, reader) > + for reader in readers] > + > + # Set $TERM = dumb > + os.putenv("TERM", "dumb") > + > + (shell_pid, shell_fd) = pty.fork() > + if shell_pid == 0: > + # Child process: run the command in a subshell > + os.execv("/bin/sh", ["/bin/sh", "-c", command]) > + else: > + # Parent process > + lock_server_running = _lock(lock_server_running_filename) > + > + # Set terminal echo on/off and disable pre- and post-processing > + attr = termios.tcgetattr(shell_fd) > + attr[0] &= ~termios.INLCR > + attr[0] &= ~termios.ICRNL > + attr[0] &= ~termios.IGNCR > + attr[1] &= ~termios.OPOST > + if echo: > + attr[3] |= termios.ECHO > + else: > + attr[3] &= ~termios.ECHO > + termios.tcsetattr(shell_fd, termios.TCSANOW, attr) > + > + # Open output file > + output_file = open(output_filename, "w") > + # Open input pipe > + os.mkfifo(inpipe_filename) > + inpipe_fd = os.open(inpipe_filename, os.O_RDWR) > + # Open output pipes (readers) > + reader_fds = [] > + for filename in reader_filenames: > + os.mkfifo(filename) > + reader_fds.append(os.open(filename, os.O_RDWR)) > + > + # Write shell PID to file > + file = open(shell_pid_filename, "w") > + file.write(str(shell_pid)) > + file.close() > + > + # Print something to stdout so the client can start working > + print "hello" > + sys.stdout.flush() > + > + # Initialize buffers > + buffers = ["" for reader in readers] > + > + # Read from child and write to files/pipes > + while True: > + # Make a list of reader pipes whose buffers are not empty > + fds = [fd for (i, fd) in enumerate(reader_fds) if buffers[i]] > + # Wait until there's something to do > + r, w, x = select.select([shell_fd, inpipe_fd], fds, []) > + # If a reader pipe is ready for writing -- > + for (i, fd) in enumerate(reader_fds): > + if fd in w: > + bytes_written = os.write(fd, buffers[i]) > + buffers[i] = buffers[i][bytes_written:] > + # If there's data to read from the child process -- > + if shell_fd in r: > + try: > + data = os.read(shell_fd, 16384) > + except OSError: > + break > + # Remove carriage returns from the data -- they often cause > + # trouble and are normally not needed > + data = data.replace("\r", "") > + output_file.write(data) > + output_file.flush() > + for i in range(len(readers)): > + buffers[i] += data > + # If there's data to read from the client -- > + if inpipe_fd in r: > + data = os.read(inpipe_fd, 1024) > + os.write(shell_fd, data) > + > + # Wait for the shell process to exit and get its exit status > + status = os.waitpid(shell_pid, 0)[1] > + status = os.WEXITSTATUS(status) > + file = open(status_filename, "w") > + file.write(str(status)) > + file.close() > + > + # Wait for the client to finish initializing > + _wait(lock_client_starting_filename) > + > + # Delete FIFOs > + for filename in reader_filenames + [inpipe_filename]: > + try: > + os.unlink(filename) > + except OSError: > + pass > + > + # Close all files and pipes > + output_file.close() > + os.close(inpipe_fd) > + for fd in reader_fds: > + os.close(fd) > + > + _unlock(lock_server_running) > + > + > +if __name__ == "__main__": > + _server_main() > -- > 1.5.4.1 > > _______________________________________________ > Autotest mailing list > Autotest@xxxxxxxxxxxxxxx > http://test.kernel.org/cgi-bin/mailman/listinfo/autotest > -- Lucas Meneghel -- To unsubscribe from this list: send the line "unsubscribe kvm" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html