foster/denoland-deno
1
0
Fork 0
mirror of https://github.com/denoland/deno.git synced 2024-11-24 15:19:26 -05:00
Code Issues Packages 1 Wiki Activity

chore: Fix flaky semantic tokens caching test (#23831)

Browse source 
The stderr stream from the LSP is consumed by a separate thread, so it
may not have processed the part we care about yet. Instead, wait until
you see the measure for the request you care about.
This commit is contained in:
Nathan Whitaker 2024-05-15 11:38:45 -07:00 committed by GitHub
parent 76234c6374
commit 3cea44abde
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 33 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
tests/integration/lsp_tests.rs
View file

@ -12740,7 +12740,7 @@ fn lsp_semantic_token_caching() {
assert_eq!(
client
.perf()
.perf_wait_for_measure("lsp.semantic_tokens_range")
.measure_count("tsc.request.getEncodedSemanticClassifications"),
1,
);
@ -12755,7 +12755,7 @@ fn lsp_semantic_token_caching() {
assert_eq!(
client
.perf()
.perf_wait_for_measure("lsp.semantic_tokens_full")
.measure_count("tsc.request.getEncodedSemanticClassifications"),
2,
);
@ -12775,7 +12775,7 @@ fn lsp_semantic_token_caching() {
// make sure we actually used the cache
assert_eq!(
client
.perf()
.perf_wait_for_measure("lsp.semantic_tokens_range")
.measure_count("tsc.request.getEncodedSemanticClassifications"),
2,
);

40
tests/util/server/src/lsp.rs
View file

@ -689,15 +689,33 @@ impl Perf {
rx,
}
}
fn drain(&mut self) {
while let Ok(record) = self.rx.try_recv() {
if let PerfRecord::Measure(measure) = &record {
*self
.measures_counts
.entry(measure.name.clone())
.or_default() += 1;
fn drain_until(&mut self, f: impl Fn(&PerfRecord) -> bool) {
let timeout_time =
Instant::now().checked_add(Duration::from_secs(5)).unwrap();
let mut found = false;
loop {
while let Ok(record) = self.rx.try_recv() {
if let PerfRecord::Measure(measure) = &record {
*self
.measures_counts
.entry(measure.name.clone())
.or_default() += 1;
}
if f(&record) {
found = true;
}
self.records.push(record);
}
if found {
break;
}
std::thread::sleep(Duration::from_millis(20));
if Instant::now() > timeout_time {
panic!("timed out waiting for perf record");
}
self.records.push(record);
}
}
pub fn measures(&self) -> impl IntoIterator<Item = &PerfMeasure> {
@ -757,12 +775,14 @@ impl LspClient {
self.reader.pending_len()
}
pub fn perf(&mut self) -> &Perf {
/// Collects performance records until a measure with the given name is
/// emitted.
pub fn perf_wait_for_measure(&mut self, name: &str) -> &Perf {
let perf = self
.perf
.as_mut()
.expect("must setup with client_builder.collect_perf()");
perf.drain();
perf.drain_until(|record| matches!(record, PerfRecord::Measure(measure) if measure.name == name));
perf
}