[Tests] another attempt to stabilize tests (#1199)

* moving custom_errors_found up
* removing json logger settings from cmd, since it's in config
* changed log success entry line, changing is up verification since rest bootstrap is longer

Author: dkijania

jormungandr-integration-tests/src/common/jormungandr/commands.rs

@@ -4,18 +4,13 @@ use std::fs::File;
 use std::path::PathBuf;
 use std::process::{Command, Stdio};
 
-fn set_json_logger(command: &mut Command) {
-    command.arg("--log-format").arg("json");
-}
-
 pub fn get_start_jormungandr_as_leader_node_command(
     config_path: &PathBuf,
     genesis_block_path: &PathBuf,
     secret_path: &PathBuf,
     log_file_path: &PathBuf,
 ) -> Command {
     let mut command = Command::new(configuration::get_jormungandr_app().as_os_str());
-    set_json_logger(&mut command);
     command
         .arg("--secret")
         .arg(secret_path.as_os_str())
@@ -34,7 +29,6 @@ pub fn get_start_jormungandr_as_passive_node_command(
     log_file_path: &PathBuf,
 ) -> Command {
     let mut command = Command::new(configuration::get_jormungandr_app().as_os_str());
-    set_json_logger(&mut command);
     command
         .arg("--config")
         .arg(config_path.as_os_str())

jormungandr-integration-tests/src/common/jormungandr/configuration_builder.rs

@@ -2,7 +2,7 @@ use crate::common::{
     configuration::{
         genesis_model::{Fund, GenesisYaml, Initial, LinearFees},
         jormungandr_config::JormungandrConfig,
-        node_config_model::{Log, NodeConfig, TrustedPeer},
+        node_config_model::{Log, LogEntry, NodeConfig, TrustedPeer},
         secret_model::SecretModel,
     },
     file_utils, jcli_wrapper,
@@ -45,7 +45,10 @@ impl ConfigurationBuilder {
             slots_per_epoch: None,
             slot_duration: None,
             epoch_stability_depth: None,
-            log: None,
+            log: Some(Log(vec![LogEntry {
+                level: Some("info".to_string()),
+                format: Some("json".to_string()),
+            }])),
             linear_fees: LinearFees {
                 constant: 0,
                 coefficient: 0,

jormungandr-integration-tests/src/common/jormungandr/starter.rs

@@ -45,8 +45,8 @@ pub enum Role {
 }
 
 pub trait StartupVerification {
-    fn stop(&self) -> bool;
-    fn success(&self) -> bool;
+    fn if_stopped(&self) -> bool;
+    fn if_succeed(&self) -> bool;
 }
 
 #[derive(Clone, Debug)]
@@ -61,12 +61,12 @@ impl RestStartupVerification {
 }
 
 impl StartupVerification for RestStartupVerification {
-    fn stop(&self) -> bool {
+    fn if_stopped(&self) -> bool {
         let logger = JormungandrLogger::new(self.config.log_file_path.clone());
         logger.contains_error().unwrap_or_else(|_| false)
     }
 
-    fn success(&self) -> bool {
+    fn if_succeed(&self) -> bool {
         let output = process_utils::run_process_and_get_output(
             jcli_commands::get_rest_stats_command(&self.config.get_node_address()),
         );
@@ -100,15 +100,15 @@ impl LogStartupVerification {
 }
 
 impl StartupVerification for LogStartupVerification {
-    fn stop(&self) -> bool {
+    fn if_stopped(&self) -> bool {
         let logger = JormungandrLogger::new(self.config.log_file_path.clone());
         logger.contains_error().unwrap_or_else(|_| false)
     }
 
-    fn success(&self) -> bool {
+    fn if_succeed(&self) -> bool {
         let logger = JormungandrLogger::new(self.config.log_file_path.clone());
         logger
-            .message_logged_multiple_times("initial bootstrap completed", 2)
+            .contains_message("genesis block fetched")
             .unwrap_or_else(|_| false)
     }
 }
@@ -212,23 +212,25 @@ impl Starter {
         process_assert::assert_process_failed_and_matches_message(command, &expected_msg);
     }
 
-    fn success(&self) -> bool {
+    fn if_succeed(&self) -> bool {
         match self.verification_mode {
             StartupVerificationMode::Rest => {
-                RestStartupVerification::new(self.config.clone()).success()
+                RestStartupVerification::new(self.config.clone()).if_succeed()
             }
             StartupVerificationMode::Log => {
-                LogStartupVerification::new(self.config.clone()).success()
+                LogStartupVerification::new(self.config.clone()).if_succeed()
             }
         }
     }
 
-    fn stop(&self) -> bool {
+    fn if_stopped(&self) -> bool {
         match self.verification_mode {
             StartupVerificationMode::Rest => {
-                RestStartupVerification::new(self.config.clone()).stop()
+                RestStartupVerification::new(self.config.clone()).if_stopped()
+            }
+            StartupVerificationMode::Log => {
+                LogStartupVerification::new(self.config.clone()).if_stopped()
             }
-            StartupVerificationMode::Log => LogStartupVerification::new(self.config.clone()).stop(),
         }
     }
 
@@ -254,19 +256,21 @@ impl Starter {
                     log_content: file_utils::read_file(&self.config.log_file_path),
                 });
             }
-            if self.success() {
+            if self.if_succeed() {
+                println!("jormungandr is up");
                 return Ok(JormungandrProcess::from_config(
                     process,
                     self.config.clone(),
                 ));
             }
-            if self.stop() {
+            self.custom_errors_found()?;
+            if self.if_stopped() {
+                println!("attempt stopped due to error signal recieved");
                 logger.print_raw_log();
                 return Err(StartupError::ErrorInLogsFound {
                     log_content: file_utils::read_file(&self.config.log_file_path),
                 });
             }
-            self.custom_errors_found()?;
             process_utils::sleep(self.sleep);
         }
     }

jormungandr-integration-tests/src/networking/testnet.rs

@@ -94,7 +94,7 @@ pub fn e2e_stake_pool() {
         .config(testnet_config.make_config())
         .timeout(Duration::from_secs(1000))
         .passive()
-        .verify_by(StartupVerificationMode::Log)
+        .verify_by(StartupVerificationMode::Rest)
         .start()
         .unwrap();
 
@@ -106,7 +106,6 @@ pub fn e2e_stake_pool() {
     //register stake pool
     let stake_pool_id = create_new_stake_pool(
         &mut actor_account,
-        "1234",
         &block0_hash,
         &jormungandr.rest_address(),
         &long_wait,