aboutsummaryrefslogtreecommitdiffstats
path: root/tools
diff options
context:
space:
mode:
authorkfraser@localhost.localdomain <kfraser@localhost.localdomain>2007-08-06 13:42:15 +0100
committerkfraser@localhost.localdomain <kfraser@localhost.localdomain>2007-08-06 13:42:15 +0100
commit4eee6b24357e3835018163e11cf01a4107ecae55 (patch)
treedfab0627c9958b06c6ffc3ccf9e544554bb660a3 /tools
parent050883d0fd37f147be8af0dbb037c4116825e36a (diff)
downloadxen-4eee6b24357e3835018163e11cf01a4107ecae55.tar.gz
xen-4eee6b24357e3835018163e11cf01a4107ecae55.tar.bz2
xen-4eee6b24357e3835018163e11cf01a4107ecae55.zip
xm: Fix control characters causing xm tests to fail.
On my FC7 installation some of the test in the xm test suite fail for no apparent reason. The problem is that the python 'readline' module puts out control characters that confuse code that parses the output of some of the xm commands that are being run. The readline module dumps those characters upon import. The attached patch works around this problem. Here's what I get in out.txt when doing 'python 2>&1 | tee out.txt' and 'import readline' on the python command line: Python 2.5 (r25:51908, Apr 10 2007, 10:29:13) [GCC 4.1.2 20070403 (Red Hat 4.1.2-8)] on linux2 Type "help", "copyright", "credits" or "license" for more information. [[?1034h>>> >>> The characters before the '>>>' above are those printed by that version of 'readline' and remain invisible on the screen but appear in the file and confuse the xm test suite parser. Signed-off-by: Stefan Berger <stefanb@us.ibm.com>
Diffstat (limited to 'tools')
-rw-r--r--tools/python/xen/xm/main.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/tools/python/xen/xm/main.py b/tools/python/xen/xm/main.py
index 59210dc526..dd0202920a 100644
--- a/tools/python/xen/xm/main.py
+++ b/tools/python/xen/xm/main.py
@@ -25,7 +25,6 @@ import atexit
import cmd
import os
import pprint
-import readline
import shlex
import sys
import re
@@ -616,6 +615,7 @@ class Shell(cmd.Cmd):
def preloop(self):
cmd.Cmd.preloop(self)
+ import readline
readline.set_completer_delims(' ')
def default(self, line):