From 987f00efbdc9bed16a428484546f35786828e66d Mon Sep 17 00:00:00 2001 From: Glenn Watson Date: Thu, 8 Oct 2015 08:02:28 +1000 Subject: [PATCH] Don't check for equal image size and all white pixels for flaky tests. Workaround for #7730. --- tests/reftest.rs | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/tests/reftest.rs b/tests/reftest.rs index b3df1abb08c..701bc066733 100644 --- a/tests/reftest.rs +++ b/tests/reftest.rs @@ -340,14 +340,17 @@ fn check_reftest(reftest: Reftest) { let (left_width, left_height, left_bytes) = capture(&reftest, 0); let (right_width, right_height, right_bytes) = capture(&reftest, 1); - assert_eq!(left_width, right_width); - assert_eq!(left_height, right_height); + // TODO(gw): This is a workaround for https://github.com/servo/servo/issues/7730 + if !reftest.is_flaky { + assert_eq!(left_width, right_width); + assert_eq!(left_height, right_height); - let left_all_white = left_bytes.iter().all(|&p| p == 255); - let right_all_white = right_bytes.iter().all(|&p| p == 255); + let left_all_white = left_bytes.iter().all(|&p| p == 255); + let right_all_white = right_bytes.iter().all(|&p| p == 255); - if left_all_white && right_all_white { - panic!("Both renderings are empty") + if left_all_white && right_all_white { + panic!("Both renderings are empty") + } } let pixels = left_bytes.iter().zip(right_bytes.iter()).map(|(&a, &b)| {