KVM test: kvm_preprocessing.py: verify PPM file validity before passing to PIL
Passing PIL an invalid PPM file makes it throw an IOError.
Signed-off-by: Michael Goldish <mgoldish@redhat.com>
git-svn-id: http://test.kernel.org/svn/autotest/trunk@3700 592f7852-d20e-0410-864c-8624ca9c26a4
diff --git a/client/tests/kvm/kvm_preprocessing.py b/client/tests/kvm/kvm_preprocessing.py
index 729e1d4..26f7f8e 100644
--- a/client/tests/kvm/kvm_preprocessing.py
+++ b/client/tests/kvm/kvm_preprocessing.py
@@ -1,7 +1,7 @@
import sys, os, time, commands, re, logging, signal, glob
from autotest_lib.client.bin import test
from autotest_lib.client.common_lib import error
-import kvm_vm, kvm_utils, kvm_subprocess
+import kvm_vm, kvm_utils, kvm_subprocess, ppm_utils
try:
import PIL.Image
except ImportError:
@@ -273,9 +273,10 @@
" files to PNG format...")
try:
for f in glob.glob(os.path.join(test.debugdir, "*.ppm")):
- new_path = f.replace(".ppm", ".png")
- image = PIL.Image.open(f)
- image.save(new_path, format = 'PNG')
+ if ppm_utils.image_verify_ppm_file(f):
+ new_path = f.replace(".ppm", ".png")
+ image = PIL.Image.open(f)
+ image.save(new_path, format='PNG')
except NameError:
pass