allow running postgres tests only

Author: Jamesbarford

database/src/pool.rs

@@ -306,7 +306,10 @@ mod tests {
     use std::str::FromStr;
 
     use super::*;
-    use crate::{tests::run_db_test, BenchmarkRequestStatus, Commit, CommitType, Date};
+    use crate::{
+        tests::{run_db_test, run_postgres_test},
+        BenchmarkRequestStatus, Commit, CommitType, Date,
+    };
 
     /// Create a Commit
     fn create_commit(commit_sha: &str, time: chrono::DateTime<Utc>, r#type: CommitType) -> Commit {
@@ -378,7 +381,7 @@ mod tests {
 
     #[tokio::test]
     async fn insert_benchmark_requests() {
-        run_db_test(|ctx| async {
+        run_postgres_test(|ctx| async {
             let db = ctx.db_client();
             let time = chrono::DateTime::from_str("2021-09-01T00:00:00.000Z").unwrap();
             let master_benchmark_request = BenchmarkRequest::create_master(

database/src/tests/mod.rs

@@ -113,9 +113,8 @@ impl TestContext {
     }
 }
 
-/// Runs a test against an actual database.
-/// Checks both Postgres and SQLite.
-pub(crate) async fn run_db_test<F, Fut>(f: F)
+/// Runs a test against an actual postgres database.
+pub(crate) async fn run_postgres_test<F, Fut>(f: F)
 where
     F: Fn(TestContext) -> Fut,
     Fut: Future<Output = anyhow::Result<TestContext>>,
@@ -126,9 +125,6 @@ where
         let ctx = TestContext::new_postgres(&db_url).await;
         let ctx = f(ctx).await.expect("Postgres test failed");
         ctx.finish().await;
-        // We don't want to run both postgres tests & sqlite tests as some tests
-        // are only designed for postgres
-        return;
     } else {
         // The github CI does not yet support running containers on Windows,
         // meaning that the test suite would fail.
@@ -141,7 +137,16 @@ where
             );
         }
     }
+}
 
+/// Runs a test against an actual database.
+/// Checks both Postgres and SQLite.
+pub(crate) async fn run_db_test<F, Fut>(f: F)
+where
+    F: Fn(TestContext) -> Fut + Clone,
+    Fut: Future<Output = anyhow::Result<TestContext>>,
+{
+    run_postgres_test(f.clone()).await;
     // SQLite
     eprintln!("Running test with SQLite");
     let ctx = TestContext::new_sqlite().await;