Merge pull request #1802 from input-output-hk/djo/flakiness_and_remove_block_in_place

UpkeepService tests flakiness

Author: Alenar

Cargo.lock

@@ -1,6 +1,6 @@
 [package]
 name = "mithril-aggregator"
-version = "0.5.37"
+version = "0.5.38"
 description = "A Mithril Aggregator server"
 authors = { workspace = true }
 edition = { workspace = true }

mithril-aggregator/Cargo.toml

@@ -136,17 +136,17 @@ mod tests {
         let main_db_connection = main_db_file_connection(&main_db_path).unwrap();
         let cardano_tx_connection = cardano_tx_db_file_connection(&ctx_db_path).unwrap();
 
-        let service = AggregatorUpkeepService::new(
-            Arc::new(main_db_connection),
-            Arc::new(SqliteConnectionPool::build_from_connection(
-                cardano_tx_connection,
-            )),
-            Arc::new(SignedEntityTypeLock::default()),
-            TestLogger::file(&log_path),
-        );
-
-        // Separate block to ensure the log is flushed after run
+        // Separate block to force log flushing by dropping the service that owns the logger
         {
+            let service = AggregatorUpkeepService::new(
+                Arc::new(main_db_connection),
+                Arc::new(SqliteConnectionPool::build_from_connection(
+                    cardano_tx_connection,
+                )),
+                Arc::new(SignedEntityTypeLock::default()),
+                TestLogger::file(&log_path),
+            );
+
             service.run().await.expect("Upkeep service failed");
         }
 
@@ -175,18 +175,18 @@ mod tests {
         .join("upkeep.log");
 
         let signed_entity_type_lock = Arc::new(SignedEntityTypeLock::default());
-        let service = AggregatorUpkeepService::new(
-            Arc::new(main_db_connection().unwrap()),
-            Arc::new(SqliteConnectionPool::build(1, cardano_tx_db_connection).unwrap()),
-            signed_entity_type_lock.clone(),
-            TestLogger::file(&log_path),
-        );
+        signed_entity_type_lock
+            .lock(SignedEntityTypeDiscriminants::CardanoTransactions)
+            .await;
 
-        // Separate block to ensure the log is flushed after run
+        // Separate block to force log flushing by dropping the service that owns the logger
         {
-            signed_entity_type_lock
-                .lock(SignedEntityTypeDiscriminants::CardanoTransactions)
-                .await;
+            let service = AggregatorUpkeepService::new(
+                Arc::new(main_db_connection().unwrap()),
+                Arc::new(SqliteConnectionPool::build(1, cardano_tx_db_connection).unwrap()),
+                signed_entity_type_lock.clone(),
+                TestLogger::file(&log_path),
+            );
             service.run().await.expect("Upkeep service failed");
         }
 

mithril-aggregator/src/services/upkeep.rs

@@ -1,6 +1,6 @@
 [package]
 name = "mithril-signer"
-version = "0.2.159"
+version = "0.2.160"
 description = "A Mithril Signer"
 authors = { workspace = true }
 edition = { workspace = true }

mithril-signer/Cargo.toml

@@ -136,17 +136,17 @@ mod tests {
         let main_db_connection = main_db_file_connection(&main_db_path).unwrap();
         let cardano_tx_connection = cardano_tx_db_file_connection(&ctx_db_path).unwrap();
 
-        let service = SignerUpkeepService::new(
-            Arc::new(main_db_connection),
-            Arc::new(SqliteConnectionPool::build_from_connection(
-                cardano_tx_connection,
-            )),
-            Arc::new(SignedEntityTypeLock::default()),
-            TestLogger::file(&log_path),
-        );
-
-        // Separate block to ensure the log is flushed after run
+        // Separate block to force log flushing by dropping the service that owns the logger
         {
+            let service = SignerUpkeepService::new(
+                Arc::new(main_db_connection),
+                Arc::new(SqliteConnectionPool::build_from_connection(
+                    cardano_tx_connection,
+                )),
+                Arc::new(SignedEntityTypeLock::default()),
+                TestLogger::file(&log_path),
+            );
+
             service.run().await.expect("Upkeep service failed");
         }
 
@@ -175,18 +175,19 @@ mod tests {
         .join("upkeep.log");
 
         let signed_entity_type_lock = Arc::new(SignedEntityTypeLock::default());
-        let service = SignerUpkeepService::new(
-            Arc::new(main_db_connection().unwrap()),
-            Arc::new(SqliteConnectionPool::build(1, cardano_tx_db_connection).unwrap()),
-            signed_entity_type_lock.clone(),
-            TestLogger::file(&log_path),
-        );
+        signed_entity_type_lock
+            .lock(SignedEntityTypeDiscriminants::CardanoTransactions)
+            .await;
 
-        // Separate block to ensure the log is flushed after run
+        // Separate block to force log flushing by dropping the service that owns the logger
         {
-            signed_entity_type_lock
-                .lock(SignedEntityTypeDiscriminants::CardanoTransactions)
-                .await;
+            let service = SignerUpkeepService::new(
+                Arc::new(main_db_connection().unwrap()),
+                Arc::new(SqliteConnectionPool::build(1, cardano_tx_db_connection).unwrap()),
+                signed_entity_type_lock.clone(),
+                TestLogger::file(&log_path),
+            );
+
             service.run().await.expect("Upkeep service failed");
         }