PR feedback - updates to job_queue

Author: Jamesbarford

site/src/job_queue.rs

@@ -60,8 +60,7 @@ fn sort_benchmark_requests<'a>(done: &HashSet<String>, request_queue: &'a mut [B
         // are ready to be benchmarked (i.e., those with parent in done or no
         // parent).
         let level_len = partition_in_place(request_queue[finished..].iter_mut(), |bmr| {
-            matches!(bmr.commit_type, BenchmarkRequestType::Release { .. })
-                || bmr.parent_sha().is_none_or(|parent| done.contains(parent))
+            bmr.parent_sha().is_none_or(|parent| done.contains(parent))
         });
 
         // No commit is ready for benchmarking. This can happen e.g. when a try parent commit
@@ -294,18 +293,9 @@ mod tests {
             .cloned()
     }
 
-    fn queue_order_matches(queue: &[BenchmarkRequest], expected: &[&str]) -> bool {
+    fn queue_order_matches(queue: &[BenchmarkRequest], expected: &[&str]) {
         let queue_shas: Vec<&str> = queue.iter().map(|req| req.tag()).collect();
-        if queue_shas.len() != expected.len() {
-            panic!("left: {:?} != right: {:?}", queue_shas, expected);
-        } else {
-            for (a, b) in queue_shas.iter().zip(expected) {
-                if a != b {
-                    panic!("left: {:?} != right: {:?}", queue_shas, expected);
-                }
-            }
-            return true;
-        }
+        assert_eq!(queue_shas, expected)
     }
 
     trait BenchmarkRequestExt {
@@ -335,7 +325,7 @@ mod tests {
         .await;
     }
 
-    /// Parent completed < 30 d ago -> child is picked
+    /// Parent completed -> child is picked
     #[tokio::test]
     async fn get_next_benchmark_request_completed_parent() {
         run_postgres_test(|ctx| async {
@@ -605,10 +595,10 @@ mod tests {
 
             let sorted: Vec<BenchmarkRequest> = build_queue(&mut *db, &completed).await.unwrap();
 
-            assert!(queue_order_matches(
+            queue_order_matches(
                 &sorted,
-                &["t1", "v.1.2.3", "123", "foo", "mmm", "yee", "baz"]
-            ));
+                &["t1", "v.1.2.3", "123", "foo", "mmm", "yee", "baz"],
+            );
             Ok(ctx)
         })
         .await;