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

Auto merge of #23571 - servo:jdm-patch-55, r=Manishearth

Browse source 
Remove sampling profiler unit test.

This test is the source of significant intermittent failures in TravisCI and Appveyor, and occasionally on taskcluster as well. It is not pulling its weight. Fixes #23354.

<!-- Reviewable:start -->
---
This change is [<img src="https://reviewable.io/review_button.svg" height="34" align="absmiddle" alt="Reviewable"/>](https://reviewable.io/reviews/servo/servo/23571)
<!-- Reviewable:end -->
This commit is contained in:
bors-servo 2019-06-15 01:43:15 -04:00 • committed by GitHub
commit 01521ff26d
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 0 additions and 50 deletions
Download patch file Download diff file Expand all files Collapse all files

50
components/background_hang_monitor/tests/hang_monitor_tests.rs
View file

@ -19,56 +19,6 @@ lazy_static! {
static ref SERIAL: Mutex<()> = Mutex::new(());
}
#[test]
#[cfg(any(target_os = "macos", target_os = "linux"))]
fn test_sampler() {
let _lock = SERIAL.lock().unwrap();
use msg::constellation_msg::SamplerControlMsg;
use serde_json::Value;
let (background_hang_monitor_ipc_sender, background_hang_monitor_receiver) =
ipc::channel().expect("ipc channel failure");
let (sampler_sender, sampler_receiver) = ipc::channel().expect("ipc channel failure");
let background_hang_monitor_register =
HangMonitorRegister::init(background_hang_monitor_ipc_sender.clone(), sampler_receiver);
let _background_hang_monitor = background_hang_monitor_register.register_component(
MonitoredComponentId(TEST_PIPELINE_ID, MonitoredComponentType::Script),
Duration::from_millis(10),
Duration::from_millis(1000),
);
const RATE: u64 = 10;
const MAX_DURATION: u64 = 10;
sampler_sender
.send(SamplerControlMsg::Enable(
Duration::from_millis(RATE),
Duration::from_secs(MAX_DURATION),
))
.unwrap();
thread::sleep(Duration::from_millis(100));
sampler_sender.send(SamplerControlMsg::Disable).unwrap();
loop {
match background_hang_monitor_receiver.recv().unwrap() {
HangMonitorAlert::Hang(_) => continue,
HangMonitorAlert::Profile(ref bytes) => {
let json: Value = serde_json::from_slice(bytes).unwrap();
let rate = json["rate"].as_u64().unwrap();
assert_eq!(rate, RATE);
let data = json["data"].as_array().unwrap();
assert!(data.len() > 1);
assert_eq!(data[0]["name"].as_str().unwrap(), "test_sampler");
assert!(data[0]["frames"].as_array().unwrap().len() > 0);
break;
},
}
}
}
#[test]
fn test_hang_monitoring() {
let _lock = SERIAL.lock().unwrap();