Make WPT percentages relative to subtests run

Author: nicoburns

Cargo.toml

@@ -32,3 +32,6 @@ foldhash = "0.2.0"
 grass = { version = "0.13", default-features = false }
 
 [features]
+
+# [patch.crates-io]
+# wptreport = { path = "../../../wpt-rs/crates/wptreport" }

src/main.rs

@@ -6,20 +6,15 @@ use axum::{
     Router,
 };
 use dashmap::DashMap;
-use dioxus::{
-    core::{ComponentFunction, SpawnIfAsync},
-    prelude::*,
-};
+use dioxus::{core::ComponentFunction, prelude::*};
 use dioxus_html_macro::html;
-use reqwest::{Client, RequestBuilder};
 use routes::{
-    AboutPage, ArcWptReport, ArcWptScores, CssSupportPage, ElementSupportPage, EventSupportPage,
-    GettingStartedPage, HomePage, NLNetInstructionsPage, WptResultsPage, WptResultsPageProps,
+    AboutPage, CssSupportPage, ElementSupportPage, EventSupportPage, GettingStartedPage, HomePage,
+    NLNetInstructionsPage, WptResultsPage, WptResultsPageProps,
 };
 use std::{
-    io::Cursor,
     net::{IpAddr, SocketAddr},
-    sync::{Arc, LazyLock},
+    sync::LazyLock,
     time::{Duration, Instant},
 };
 use tokio::net::TcpListener;

src/routes/nlnet_instructions.rs

@@ -82,7 +82,7 @@ pub fn NLNetInstructionsPage() -> Element {
                                 just build
                             "#
                         }
-                    }       
+                    }
                 }
                 li {
                     dangerous_inner_html: r#"

src/routes/wpt.rs

@@ -76,9 +76,8 @@ pub fn WptResultsPage(report: ArcWptReport, scores: ArcWptScores) -> Element {
             }
             p {
                 font_size: "smaller",
-                "Note: As it does not have a JavaScript engine, Blitz can only count about 25% of the subtests (because Blitz's test runner will see a test with many
-                subtests generated by JS as only 1 test. And of those, it can only run approximately 2/3rd's (as many depend on JS). The numbers here use the 
-                number of (sub)tests that Blitz's test runner can see as the denominator, and counts tests skipped as failures.
+                "Note: As it does not have a JavaScript engine, Blitz can only run about 20% of the total subtests. In the numbers below, tests that Blitz can't run are ignored
+                and percentages are relative to the number of tests run.
                 "
             }
             WptResults { scores }

src/wpt.rs

@@ -5,7 +5,10 @@ use std::{
 };
 
 use reqwest::Client;
-use wptreport::{score_wpt_report, wpt_report::WptReport};
+use wptreport::{
+    score_wpt_report,
+    wpt_report::{TestStatus, WptReport},
+};
 
 use crate::routes::{ArcWptReport, ArcWptScores};
 
@@ -21,7 +24,8 @@ impl WptReportCache {
         (*self.0.lock().unwrap()).clone()
     }
 
-    pub fn get_mut(&self) -> MutexGuard<Option<Arc<WptReportCacheEntry>>> {
+    #[allow(dead_code)]
+    pub fn get_mut(&self) -> MutexGuard<'_, Option<Arc<WptReportCacheEntry>>> {
         self.0.lock().unwrap()
     }
 
@@ -85,7 +89,13 @@ pub async fn load_wpt_results(etag: Option<Arc<str>>) {
     let compressed_report = result.bytes().await.unwrap();
 
     let uncompressed_report = zstd::decode_all(Cursor::new(&compressed_report)).unwrap();
-    let report: WptReport = serde_json::from_slice(&uncompressed_report).unwrap();
+    let mut report: WptReport = serde_json::from_slice(&uncompressed_report).unwrap();
+
+    // Strip skipped tests
+    report
+        .results
+        .retain(|test| test.status != TestStatus::Skip);
+
     let scores = score_wpt_report::<WptReport>(&report);
 
     let report = ArcWptReport(Arc::new(report));