re-do all tests

Author: Jamesbarford

site/src/job_queue.rs

@@ -69,12 +69,12 @@ fn sort_benchmark_requests<'a>(done: &HashSet<String>, request_queue: &'a mut [B
         // let the commits be benchmarked in the current order that we have, these benchmark runs
         // just won't have a parent result available.
         if level_len == 0 {
-            log::warn!("No commit is ready for benchmarking");
-            #[cfg(test)]
-            {
+            if cfg!(test) {
                 panic!("No commit is ready for benchmarking");
+            } else {
+                log::warn!("No commit is ready for benchmarking");
+                return;
             }
-            return;
         }
 
         // Everything in level has the same topological order, then we sort based on heuristics
@@ -525,8 +525,16 @@ mod tests {
              *             | m "rrr" C | -----+-->
              *             +-----------+      |
              *                                |    +---------------+
-             *                                +--->| t "yee" R pr1 | 5: a try with a low pr
+             *                                +--->| t "yee" R pr1 | 6: a try with a low pr
              *                                     +---------------+
+             *             +-----------+
+             *             | m "aaa" C |
+             *             +-----------+
+             *                   |
+             *                   V
+             *           +----------------+
+             *           | m "mmm" R pr88 | 4: a master commit
+             *           +----------------+
              *
              *             +-----------+
              *             | m "345" C |
@@ -549,7 +557,7 @@ mod tests {
              *                   |
              *                   V
              *           +---------------+
-             *           | t "baz" R pr4 | 6: a try with a higher pr
+             *           | t "baz" R pr4 | 7: a try with a higher pr
              *           +---------------+
              *
              *  The master commits should take priority, then "yee" followed
@@ -563,19 +571,24 @@ mod tests {
                 create_try("baz", "foo", 4, "days1"),
                 create_release("v.1.2.3", "days2"),
                 create_try("yee", "rrr", 1, "days2"), // lower PR number takes priority
-                create_try("t1", "rrr", 1, "days2").with_status(BenchmarkRequestStatus::InProgress),
+                create_try("t1", "rrr", 1, "days1").with_status(BenchmarkRequestStatus::InProgress),
+                create_master("mmm", "aaa", 88, "days2"),
             ];
 
             db_insert_requests(&*db, &requests).await;
 
-            let completed: HashSet<String> =
-                HashSet::from(["bar".to_string(), "345".to_string(), "rrr".to_string()]);
+            let completed: HashSet<String> = HashSet::from([
+                "bar".to_string(),
+                "345".to_string(),
+                "rrr".to_string(),
+                "aaa".to_string(),
+            ]);
 
             let sorted: Vec<BenchmarkRequest> = build_queue(&mut *db, &completed).await.unwrap();
 
             assert!(queue_order_matches(
                 &sorted,
-                &["t1", "v.1.2.3", "123", "foo", "yee", "baz"]
+                &["t1", "v.1.2.3", "123", "foo", "mmm", "yee", "baz"]
             ));
             Ok(ctx)
         })