summaryrefslogtreecommitdiff
path: root/scripts/Expect.py
diff options
context:
space:
mode:
authorJose <jose@zeroc.com>2015-08-13 14:05:15 +0200
committerJose <jose@zeroc.com>2015-08-13 14:05:15 +0200
commitae463e8642088f043c6b0d5e4a6e5020a4e69f1b (patch)
treec0cc75ff2b8e10138af1a7f65dee9131f0f1c5cd /scripts/Expect.py
parentFix SDK Prefix for Windows 8.1 (diff)
downloadice-ae463e8642088f043c6b0d5e4a6e5020a4e69f1b.tar.bz2
ice-ae463e8642088f043c6b0d5e4a6e5020a4e69f1b.tar.xz
ice-ae463e8642088f043c6b0d5e4a6e5020a4e69f1b.zip
Minor fix to Expect script
Diffstat (limited to 'scripts/Expect.py')
-rwxr-xr-xscripts/Expect.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/scripts/Expect.py b/scripts/Expect.py
index c2d816dcd67..2bd23444e87 100755
--- a/scripts/Expect.py
+++ b/scripts/Expect.py
@@ -259,7 +259,7 @@ class reader(threading.Thread):
continue
# If no match and the process has exited rasise a TIMEOUT
- if self.p and self.p.poll() is not None:
+ if isinstance(self.p, subprocess.Popen) and self.p.poll() is not None:
raise TIMEOUT ('timeout exceeded in match\npattern: "%s"\nbuffer: "%s"\n' %
(escape(s), escape(buf, False)))