From 28b80ba42ad8e2ee27850f0ee03206feb98f5b2f Mon Sep 17 00:00:00 2001
From: Rob Bradford <robert.bradford@intel.com>
Date: Mon, 28 Jun 2021 15:23:25 +0000
Subject: [PATCH] tests: Change string checking for console success

The output from getty ("login:") does not always appear. This can be
observed interactively when booting the VM. (Mashing return will bring
it up.) Instead of checking for that string to ensure the VM has booted
instead check for a message from systemd to say it has started the SSH
daemon.

Fixes: #2799

Signed-off-by: Rob Bradford <robert.bradford@intel.com>
---
 tests/integration.rs | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/tests/integration.rs b/tests/integration.rs
index b6e403864..290a69287 100644
--- a/tests/integration.rs
+++ b/tests/integration.rs
@@ -85,6 +85,8 @@ mod tests {
 
     const PIPE_SIZE: i32 = 32 << 20;
 
+    const CONSOLE_TEST_STRING: &str = "Started OpenBSD Secure Shell server";
+
     fn clh_command(cmd: &str) -> String {
         env::var("BUILD_TARGET").map_or(
             format!("target/x86_64-unknown-linux-gnu/release/{}", cmd),
@@ -2908,7 +2910,7 @@ mod tests {
             handle_child_output(r, &output);
 
             let r = std::panic::catch_unwind(|| {
-                assert!(!String::from_utf8_lossy(&output.stdout).contains("cloud login:"));
+                assert!(!String::from_utf8_lossy(&output.stdout).contains(CONSOLE_TEST_STRING));
             });
 
             handle_child_output(r, &output);
@@ -2967,7 +2969,7 @@ mod tests {
             handle_child_output(r, &output);
 
             let r = std::panic::catch_unwind(|| {
-                assert!(String::from_utf8_lossy(&output.stdout).contains("cloud login:"));
+                assert!(String::from_utf8_lossy(&output.stdout).contains(CONSOLE_TEST_STRING));
             });
 
             handle_child_output(r, &output);
@@ -3035,7 +3037,7 @@ mod tests {
                 let mut f = std::fs::File::open(serial_path).unwrap();
                 let mut buf = String::new();
                 f.read_to_string(&mut buf).unwrap();
-                assert!(buf.contains("cloud login:"));
+                assert!(buf.contains(CONSOLE_TEST_STRING));
             });
 
             handle_child_output(r, &output);
@@ -3214,13 +3216,13 @@ mod tests {
                 let mut buf = String::new();
                 f.read_to_string(&mut buf).unwrap();
 
-                if !buf.contains("cloud login:") {
+                if !buf.contains(CONSOLE_TEST_STRING) {
                     eprintln!(
                         "\n\n==== Console file output ====\n\n{}\n\n==== End console file output ====",
                         buf
                     );
                 }
-                assert!(buf.contains("cloud login:"));
+                assert!(buf.contains(CONSOLE_TEST_STRING));
             });
 
             handle_child_output(r, &output);