PR Feedback: rename builder method, revert query and change sleep function in test

Author: Jamesbarford

database/src/pool.rs

@@ -1350,7 +1350,7 @@ mod tests {
             assert_eq!(job.request_tag(), benchmark_request.tag().unwrap());
 
             /* Make the job take some amount of time */
-            std::thread::sleep(Duration::from_millis(1000));
+            tokio::time::sleep(Duration::from_millis(1000)).await;
 
             /* Mark the job as complete */
             db.mark_benchmark_job_as_completed(job.id(), BenchmarkJobConclusion::Success)

database/src/pool/postgres.rs

@@ -1993,8 +1993,8 @@ where
                         -- previously, so that we can finish them. Also prefer
                         -- mandatory jobs over optional ones.
                         CASE
-                            WHEN (status = $5 AND is_optional = FALSE) THEN 0
-                            WHEN (status = $1 AND is_optional = FALSE) THEN 1
+                            WHEN status = $5 THEN 0
+                            WHEN status = $1 THEN 1
                             ELSE 2
                         END,
                         request_tag,

database/src/tests/builder.rs

@@ -126,7 +126,7 @@ impl JobBuilder {
         self
     }
 
-    pub fn is_optional(mut self, is_optional: bool) -> Self {
+    pub fn make_optional(mut self, is_optional: bool) -> Self {
         self.is_optional = is_optional;
         self
     }