summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authordpranke@google.com <dpranke@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2009-07-24 20:40:35 +0000
committerdpranke@google.com <dpranke@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2009-07-24 20:40:35 +0000
commit64b645816473c22a5f95e5ea60edb22bea2b2792 (patch)
treee3d9b0b85f5d688aac49fb7041b3f35d0ef31061
parentbc20887d969e58ec90b1b9b512f7de6f01e41dd3 (diff)
downloadchromium_src-64b645816473c22a5f95e5ea60edb22bea2b2792.zip
chromium_src-64b645816473c22a5f95e5ea60edb22bea2b2792.tar.gz
chromium_src-64b645816473c22a5f95e5ea60edb22bea2b2792.tar.bz2
redo CL 21368 - work around a race in python 2.4's popen() call
this was causing diffs to show up in layout tests on vista BUG=none TEST=none R=maruel@chromium.org git-svn-id: svn://svn.chromium.org/chrome/trunk/src@21569 0039d316-1c4b-4281-b951-d872f2087c98
-rw-r--r--webkit/tools/layout_tests/test_types/image_diff.py4
1 files changed, 4 insertions, 0 deletions
diff --git a/webkit/tools/layout_tests/test_types/image_diff.py b/webkit/tools/layout_tests/test_types/image_diff.py
index 684c582..7e32a78 100644
--- a/webkit/tools/layout_tests/test_types/image_diff.py
+++ b/webkit/tools/layout_tests/test_types/image_diff.py
@@ -93,6 +93,10 @@ class ImageDiff(test_type_base.TestTypeBase):
_compare_available = False
else:
raise e
+ except ValueError:
+ # work around a race condition in Python 2.4's implementation of
+ # subprocess.Popen
+ pass
global _compare_msg_printed