Mirrors/servo
1
0
Fork 0
mirror of https://github.com/servo/servo.git synced 2025-08-06 14:10:11 +01:00
Code Issues Projects Releases Packages Wiki Activity

Auto merge of #7916 - glennw:flaky-mac, r=jdm

Browse source 
Don't check for equal image size and all white pixels for flaky tests.

Workaround for #7730.

<!-- Reviewable:start -->
[<img src="https://reviewable.io/review_button.png" height=40 alt="Review on Reviewable"/>](https://reviewable.io/reviews/servo/servo/7916)
<!-- Reviewable:end -->
This commit is contained in:
bors-servo 2015-10-07 19:59:04 -06:00
commit b34e8b86b8
1 changed files with 9 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

15
tests/reftest.rs vendored
View file

@ -340,14 +340,17 @@ fn check_reftest(reftest: Reftest) {
let (left_width, left_height, left_bytes) = capture(&reftest, 0); let (left_width, left_height, left_bytes) = capture(&reftest, 0);
let (right_width, right_height, right_bytes) = capture(&reftest, 1); let (right_width, right_height, right_bytes) = capture(&reftest, 1);
assert_eq!(left_width, right_width); // TODO(gw): This is a workaround for https://github.com/servo/servo/issues/7730
assert_eq!(left_height, right_height); 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 left_all_white = left_bytes.iter().all(|&p| p == 255);
let right_all_white = right_bytes.iter().all(|&p| p == 255); let right_all_white = right_bytes.iter().all(|&p| p == 255);
if left_all_white && right_all_white { if left_all_white && right_all_white {
panic!("Both renderings are empty") panic!("Both renderings are empty")
}
} }
let pixels = left_bytes.iter().zip(right_bytes.iter()).map(|(&a, &b)| { let pixels = left_bytes.iter().zip(right_bytes.iter()).map(|(&a, &b)| {