group TestResult in experiment page

zeegomo · zeegomo · commit 2a30b9d460a2 · 2020-06-20T11:53:11.000+02:00
diff --git a/src/server/routes/ui/experiments.rs b/src/server/routes/ui/experiments.rs
@@ -1,12 +1,13 @@
 use crate::experiments::{Experiment, Mode, Status};
 use crate::prelude::*;
-use crate::results::TestResult;
+use crate::report::ResultName;
 use crate::server::routes::ui::{render_template, LayoutContext};
 use crate::server::{Data, HttpError};
 use chrono::{Duration, SecondsFormat, Utc};
 use chrono_humanize::{Accuracy, HumanTime, Tense};
 use http::Response;
 use hyper::Body;
+use std::collections::HashMap;
 use std::sync::Arc;
 
 #[derive(Serialize)]
@@ -121,7 +122,7 @@ struct ExperimentExt {
 
     total_jobs: u32,
     completed_jobs: u32,
-    result_counts: Vec<(TestResult, u32)>,
+    result_counts: Vec<(String, u32)>,
     duration: Option<String>,
     estimated_end: Option<String>,
     average_job_duration: Option<String>,
@@ -136,7 +137,13 @@ struct ExperimentContext {
 pub fn endpoint_experiment(name: String, data: Arc<Data>) -> Fallible<Response<Body>> {
     if let Some(ex) = Experiment::get(&data.db, &name)? {
         let (completed_jobs, total_jobs) = ex.raw_progress(&data.db)?;
-        let result_counts = ex.get_result_counts(&data.db)?;
+        // this is done to avoid having tons of different test result types in the experiment page
+        // all CompilerError and DependsOn failures are grouped together
+        let mut result_counts = HashMap::new();
+        for (res, count) in ex.get_result_counts(&data.db)? {
+            *result_counts.entry(res.name()).or_default() += count;
+        }
+        let result_counts = result_counts.into_iter().collect::<Vec<_>>();
 
         let (duration, estimated_end, average_job_duration) = if completed_jobs > 0
             && total_jobs > 0
