Remove #[serial_test::serial] from almost all tests

OpenRailAssociation · Jan 3, 2024 · e91e5b7 · e91e5b7
1 parent 8c3d6c2
commit e91e5b7
Show file tree

Hide file tree

Showing 30 changed files with 2 additions and 154 deletions.
diff --git a/editoast/README.md b/editoast/README.md
@@ -37,8 +37,6 @@ To avoid thread conflicts while accessing the database, use serial_test
 #[serial_test::serial]
 ```
 
-<!--- TODO: when tests are isolated, allow multiple threads (4 may be a good tradeoff for speed/DB pool)  --->
-
 ```sh
 cargo test
 ```

diff --git a/editoast/src/generated_data/error/switches.rs b/editoast/src/generated_data/error/switches.rs
@@ -180,7 +180,6 @@ mod tests {
     }
 
     #[test]
-    #[serial_test::serial]
     fn not_unique_endpoints() {
         let mut infra_cache = create_small_infra_cache();
         // Ports A and B1 map the same endpoint

diff --git a/editoast/src/generated_data/mod.rs b/editoast/src/generated_data/mod.rs
@@ -156,7 +156,6 @@ pub mod tests {
     use diesel_async::AsyncPgConnection as PgConnection;
 
     #[actix_test] // Slow test
-    #[serial_test::serial]
     async fn refresh_all_test() {
         test_infra_and_delete(|pool, infra: Infra| {
             async move {
@@ -170,7 +169,6 @@ pub mod tests {
     }
 
     #[actix_test]
-    #[serial_test::serial]
     async fn update_all_test() {
         test_infra_transaction(|conn: &mut PgConnection, infra: Infra| {
             async move {
@@ -186,7 +184,6 @@ pub mod tests {
     }
 
     #[actix_test]
-    #[serial_test::serial]
     async fn clear_all_test() {
         test_infra_transaction(|conn: &mut PgConnection, infra: Infra| {
             async move {

diff --git a/editoast/src/infra_cache/mod.rs b/editoast/src/infra_cache/mod.rs
@@ -726,7 +726,6 @@ pub mod tests {
     };
 
     #[actix_test]
-    #[serial_test::serial]
     async fn load_track_section() {
         test_infra_transaction(|conn, infra| {
             async move {
@@ -741,7 +740,6 @@ pub mod tests {
     }
 
     #[actix_test]
-    #[serial_test::serial]
     async fn load_signal() {
         test_infra_transaction(|conn, infra| {
             {
@@ -759,7 +757,6 @@ pub mod tests {
     }
 
     #[actix_test]
-    #[serial_test::serial]
     async fn load_speed_section() {
         test_infra_transaction(|conn, infra| {
             async move {
@@ -783,7 +780,6 @@ pub mod tests {
     }
 
     #[actix_test]
-    #[serial_test::serial]
     async fn load_route() {
         test_infra_transaction(|conn, infra| {
             async move {
@@ -797,7 +793,6 @@ pub mod tests {
     }
 
     #[actix_test]
-    #[serial_test::serial]
     async fn load_operational_point() {
         test_infra_transaction(|conn, infra| {
             async move {
@@ -823,7 +818,6 @@ pub mod tests {
     }
 
     #[actix_test]
-    #[serial_test::serial]
     async fn load_switch() {
         test_infra_transaction(|conn, infra| {
             async move {
@@ -845,7 +839,6 @@ pub mod tests {
     }
 
     #[actix_test]
-    #[serial_test::serial]
     async fn load_switch_type() {
         test_infra_transaction(|conn, infra| {
             async move {
@@ -859,7 +852,6 @@ pub mod tests {
     }
 
     #[actix_test]
-    #[serial_test::serial]
     async fn load_detector() {
         test_infra_transaction(|conn, infra| {
             async move {
@@ -877,7 +869,6 @@ pub mod tests {
     }
 
     #[actix_test]
-    #[serial_test::serial]
     async fn load_buffer_stop() {
         test_infra_transaction(|conn, infra| {
             async move {
@@ -895,7 +886,6 @@ pub mod tests {
     }
 
     #[actix_test]
-    #[serial_test::serial]
     async fn load_catenary() {
         test_infra_transaction(|conn, infra| {
             async move {
@@ -1199,7 +1189,6 @@ pub mod tests {
     }
 
     #[actix_test]
-    #[serial_test::serial]
     async fn load_infra_cache() {
         test_infra_transaction(|conn, infra| {
             async move {
@@ -1219,7 +1208,6 @@ pub mod tests {
     }
 
     #[actix_test]
-    #[serial_test::serial]
     async fn load_infra_cache_mut() {
         test_infra_transaction(|conn, infra| {
             async move {

diff --git a/editoast/src/main.rs b/editoast/src/main.rs
@@ -753,7 +753,6 @@ mod tests {
     use tempfile::NamedTempFile;
 
     #[rstest]
-    #[serial_test::serial]
     async fn import_rolling_stock_ko_file_not_found(db_pool: Data<DbPool>) {
         // GIVEN
         let args = ImportRollingStockArgs {
@@ -768,7 +767,6 @@ mod tests {
     }
 
     #[rstest]
-    #[serial_test::serial]
     async fn import_non_electric_rs_without_startup_and_panto_values(db_pool: Data<DbPool>) {
         // GIVEN
         let rolling_stock_name =
@@ -800,7 +798,6 @@ mod tests {
     }
 
     #[rstest]
-    #[serial_test::serial]
     async fn import_non_electric_rs_with_startup_and_panto_values(db_pool: Data<DbPool>) {
         // GIVEN
         let rolling_stock_name =
@@ -836,7 +833,6 @@ mod tests {
     }
 
     #[rstest]
-    #[serial_test::serial]
     async fn import_electric_rs_without_startup_and_panto_values(db_pool: Data<DbPool>) {
         // GIVEN
         let rolling_stock_name =
@@ -864,7 +860,6 @@ mod tests {
     }
 
     #[rstest]
-    #[serial_test::serial]
     async fn import_electric_rs_with_startup_and_panto_values(db_pool: Data<DbPool>) {
         // GIVEN
         let rolling_stock_name =
@@ -904,7 +899,6 @@ mod tests {
     }
 
     #[rstest]
-    #[serial_test::serial]
     async fn import_railjson_ko_file_not_found(db_pool: Data<DbPool>) {
         // GIVEN
         let railjson_path = "non/existing/railjson/file/location";
@@ -930,7 +924,6 @@ mod tests {
     }
 
     #[rstest]
-    #[serial_test::serial]
     async fn import_railjson_ok(db_pool: Data<DbPool>) {
         // GIVEN
         let railjson = Default::default();
@@ -970,7 +963,6 @@ mod tests {
     }
 
     #[rstest]
-    #[serial_test::serial]
     async fn test_electrical_profile_set_delete(
         #[future] electrical_profile_set: TestFixture<ElectricalProfileSet>,
         db_pool: Data<DbPool>,
@@ -998,7 +990,6 @@ mod tests {
     }
 
     #[rstest]
-    #[serial_test::serial]
     async fn test_electrical_profile_set_list_doesnt_fail(
         #[future] electrical_profile_set: TestFixture<ElectricalProfileSet>,
         db_pool: Data<DbPool>,

diff --git a/editoast/src/models/infra.rs b/editoast/src/models/infra.rs
@@ -370,7 +370,6 @@ pub mod tests {
     }
 
     #[actix_test]
-    #[serial_test::serial]
     async fn create_infra() {
         test_infra_transaction(|_, infra| {
             async move {
@@ -387,7 +386,6 @@ pub mod tests {
     }
 
     #[rstest]
-    #[serial_test::serial]
     async fn clone_infra_with_new_name_returns_new_cloned_infra() {
         // GIVEN
         let pg_db_pool = db_pool();
@@ -420,7 +418,6 @@ pub mod tests {
     }
 
     #[rstest]
-    #[serial_test::serial]
     async fn clone_infra_without_new_name_returns_new_cloned_infra() {
         // GIVEN
         let pg_db_pool = db_pool();
@@ -449,7 +446,6 @@ pub mod tests {
     }
 
     #[actix_test]
-    #[serial_test::serial]
     async fn clone_infra_returns_infra_not_found() {
         // GIVEN
         let not_found_infra_id: i64 = 1234567890;

diff --git a/editoast/src/models/projects.rs b/editoast/src/models/projects.rs
@@ -278,7 +278,6 @@ pub mod test {
     use rstest::rstest;
 
     #[rstest]
-    #[serial_test::serial]
     async fn create_delete_project(#[future] project: TestFixture<Project>, db_pool: Data<DbPool>) {
         let project = project.await;
         // Delete the project
@@ -290,7 +289,6 @@ pub mod test {
     }
 
     #[rstest]
-    #[serial_test::serial]
     async fn get_project(#[future] project: TestFixture<Project>, db_pool: Data<DbPool>) {
         let project = project.await;
 
@@ -307,7 +305,6 @@ pub mod test {
     }
 
     #[rstest]
-    #[serial_test::serial]
     async fn sort_project(#[future] project: TestFixture<Project>, db_pool: Data<DbPool>) {
         let project = project.await;
 
@@ -332,7 +329,6 @@ pub mod test {
     }
 
     #[rstest]
-    #[serial_test::serial]
     async fn update_project(#[future] project: TestFixture<Project>, db_pool: Data<DbPool>) {
         let project_fixture = project.await;
 

diff --git a/editoast/src/models/rolling_stock/light_rolling_stock.rs b/editoast/src/models/rolling_stock/light_rolling_stock.rs
@@ -133,7 +133,6 @@ pub mod tests {
     use super::LightRollingStockModel;
 
     #[rstest]
-    #[serial_test::serial]
     async fn get_light_rolling_stock(db_pool: Data<DbPool>) {
         // GIVEN
         let rolling_stock = named_fast_rolling_stock(
@@ -150,7 +149,6 @@ pub mod tests {
     }
 
     #[rstest]
-    #[serial_test::serial]
     async fn list_light_rolling_stock(db_pool: Data<DbPool>) {
         // GIVEN
         let rolling_stock = named_fast_rolling_stock(

diff --git a/editoast/src/models/rolling_stock/mod.rs b/editoast/src/models/rolling_stock/mod.rs
@@ -332,7 +332,6 @@ pub mod tests {
     }
 
     #[rstest]
-    #[serial_test::serial]
     async fn create_delete_rolling_stock(db_pool: Data<DbPool>) {
         let name = "fast_rolling_stock_create_delete_rolling_stock";
         let rolling_stock_id: i64;
@@ -348,7 +347,6 @@ pub mod tests {
     }
 
     #[rstest]
-    #[serial_test::serial]
     async fn update_rolling_stock(db_pool: Data<DbPool>) {
         // GIVEN
         let other_rs_name = "other_rolling_stock_update_rolling_stock";
@@ -372,7 +370,6 @@ pub mod tests {
     }
 
     #[rstest]
-    #[serial_test::serial]
     async fn update_rolling_stock_failure_name_already_used(db_pool: Data<DbPool>) {
         // GIVEN
         let name = "fast_rolling_stock_update_rolling_stock_failure_name_already_used";

diff --git a/editoast/src/models/scenario.rs b/editoast/src/models/scenario.rs
@@ -220,7 +220,6 @@ pub mod test {
     use rstest::rstest;
 
     #[rstest]
-    #[serial_test::serial]
     async fn create_delete_scenario(db_pool: Data<DbPool>) {
         let ScenarioFixtureSet { scenario, .. } = scenario_fixture_set().await;
 
@@ -236,7 +235,6 @@ pub mod test {
     }
 
     #[rstest]
-    #[serial_test::serial]
     async fn get_study(db_pool: Data<DbPool>) {
         let ScenarioFixtureSet { study, .. } = scenario_fixture_set().await;
 
@@ -255,7 +253,6 @@ pub mod test {
     }
 
     #[rstest]
-    #[serial_test::serial]
     async fn sort_scenario(db_pool: Data<DbPool>) {
         let ScenarioFixtureSet {
             scenario,

diff --git a/editoast/src/models/study.rs b/editoast/src/models/study.rs
@@ -199,7 +199,6 @@ pub mod test {
     use rstest::rstest;
 
     #[rstest]
-    #[serial_test::serial]
     async fn create_delete_study(
         #[future] study_fixture_set: StudyFixtureSet,
         db_pool: Data<DbPool>,
@@ -214,7 +213,6 @@ pub mod test {
     }
 
     #[rstest]
-    #[serial_test::serial]
     async fn get_study(#[future] study_fixture_set: StudyFixtureSet, db_pool: Data<DbPool>) {
         let StudyFixtureSet { study, project } = study_fixture_set.await;
 
@@ -231,7 +229,6 @@ pub mod test {
     }
 
     #[rstest]
-    #[serial_test::serial]
     async fn sort_study(#[future] study_fixture_set: StudyFixtureSet, db_pool: Data<DbPool>) {
         let StudyFixtureSet { study, project } = study_fixture_set.await;
 

diff --git a/editoast/src/schema/buffer_stop.rs b/editoast/src/schema/buffer_stop.rs
@@ -104,7 +104,6 @@ mod test {
     use diesel_async::scoped_futures::ScopedFutureExt;
 
     #[actix_test]
-    #[serial_test::serial]
     async fn test_persist() {
         test_infra_transaction(|conn, infra| {
             async move {
@@ -122,7 +121,6 @@ mod test {
     }
 
     #[actix_test] // Slow test
-    #[serial_test::serial]
     async fn test_persist_large() {
         test_infra_transaction(|conn, infra| {
             async move {
-Original file line number
+Diff line change
@@ Expand Up @@
     #[serial_test::serial]
     ```
-    <!--- TODO: when tests are isolated, allow multiple threads (4 may be a good tradeoff for speed/DB pool)  --->
     ```sh
     cargo test
     ```
@@ Expand Down @@