mirror of
https://github.com/cloud-hypervisor/cloud-hypervisor.git
synced 2024-10-05 13:05:45 +00:00
tests: Remove the check on the "booted" message in 'wait_vm_boot()'
Given we already check the connected IP address matches the expected guest IP address, the check on the "booted" message is not needed. Fixes: #2117 Signed-off-by: Bo Chen <chen.bo@intel.com> Signed-off-by: Rob Bradford <robert.bradford@intel.com>
This commit is contained in:
parent
f70852c04b
commit
a286e960ed
@ -641,7 +641,6 @@ mod tests {
|
|||||||
ReadToString(std::io::Error),
|
ReadToString(std::io::Error),
|
||||||
SetReadTimeout(std::io::Error),
|
SetReadTimeout(std::io::Error),
|
||||||
WrongGuestAddr,
|
WrongGuestAddr,
|
||||||
WrongGuestMsg,
|
|
||||||
}
|
}
|
||||||
|
|
||||||
impl std::error::Error for Error {}
|
impl std::error::Error for Error {}
|
||||||
@ -871,7 +870,7 @@ mod tests {
|
|||||||
}
|
}
|
||||||
|
|
||||||
match listener.accept() {
|
match listener.accept() {
|
||||||
Ok((mut stream, addr)) => {
|
Ok((_, addr)) => {
|
||||||
// Make sure the connection is from the expected 'guest_addr'
|
// Make sure the connection is from the expected 'guest_addr'
|
||||||
if addr.ip() != std::net::IpAddr::from_str(expected_guest_addr).unwrap() {
|
if addr.ip() != std::net::IpAddr::from_str(expected_guest_addr).unwrap() {
|
||||||
s = format!(
|
s = format!(
|
||||||
@ -882,22 +881,6 @@ mod tests {
|
|||||||
return Err(Error::WrongGuestAddr);
|
return Err(Error::WrongGuestAddr);
|
||||||
}
|
}
|
||||||
|
|
||||||
// Make sure the right message is to notify the guest VM is booted
|
|
||||||
let mut data = String::new();
|
|
||||||
stream
|
|
||||||
.set_read_timeout(Some(std::time::Duration::new(timeout as u64, 0)))
|
|
||||||
.map_err(Error::SetReadTimeout)?;
|
|
||||||
stream
|
|
||||||
.read_to_string(&mut data)
|
|
||||||
.map_err(Error::ReadToString)?;
|
|
||||||
if data != DEFAULT_TCP_LISTENER_MESSAGE {
|
|
||||||
s = format!(
|
|
||||||
"Expecting the guest message '{}' while receiving the message '{}'",
|
|
||||||
DEFAULT_TCP_LISTENER_MESSAGE, data
|
|
||||||
);
|
|
||||||
return Err(Error::WrongGuestMsg);
|
|
||||||
};
|
|
||||||
|
|
||||||
Ok(())
|
Ok(())
|
||||||
}
|
}
|
||||||
Err(e) => {
|
Err(e) => {
|
||||||
|
Loading…
Reference in New Issue
Block a user