Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 0 additions & 2 deletions .buildkite/pipeline_pr.py
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,6 @@
{
"command": "./tools/devtool -y checkstyle",
"label": "🪶 Style",
"depends_on": None,
},
depends_on_build=False,
)
Expand Down Expand Up @@ -66,7 +65,6 @@
# modify Kani steps' label
for step in kani_grp["steps"]:
step["label"] = "🔍 Kani"
kani_grp["depends_on"] = None

if run_all_tests(changed_files):
pipeline.build_group(
Expand Down
8 changes: 4 additions & 4 deletions tests/framework/microvm.py
Original file line number Diff line number Diff line change
Expand Up @@ -654,7 +654,7 @@ def spawn(
if "no-api" not in self.jailer.extra_args:
self._wait_create()
if "config-file" in self.jailer.extra_args and self.iface:
self.wait_for_up()
self.wait_for_ssh_up()
if self.log_file and log_level in ("Trace", "Debug", "Info"):
self.check_log_message("Running Firecracker")

Expand Down Expand Up @@ -879,7 +879,7 @@ def start(self):
assert self.state == "Running"

if self.iface:
self.wait_for_up()
self.wait_for_ssh_up()

def pause(self):
"""Pauses the microVM"""
Expand Down Expand Up @@ -963,7 +963,7 @@ def restore_from_snapshot(
)
# This is not a "wait for boot", but rather a "VM still works after restoration"
if snapshot.net_ifaces and resume:
self.wait_for_up()
self.wait_for_ssh_up()
return jailed_snapshot

def enable_entropy_device(self):
Expand Down Expand Up @@ -1003,7 +1003,7 @@ def thread_backtraces(self):
)
return "\n".join(backtraces)

def wait_for_up(self, timeout=10):
def wait_for_ssh_up(self, timeout=10):
"""Wait for guest running inside the microVM to come up and respond.

:param timeout: seconds to wait.
Expand Down
4 changes: 2 additions & 2 deletions tests/integration_tests/functional/test_pause_resume.py
Original file line number Diff line number Diff line change
Expand Up @@ -50,15 +50,15 @@ def test_pause_resume(uvm_nano):

# Verify guest is no longer active.
with pytest.raises(AssertionError):
microvm.wait_for_up()
microvm.wait_for_ssh_up()

# Verify emulation was indeed paused and no events from either
# guest or host side were handled.
verify_net_emulation_paused(microvm.flush_metrics())

# Verify guest is no longer active.
with pytest.raises(AssertionError):
microvm.wait_for_up()
microvm.wait_for_ssh_up()

# Pausing the microVM when it is already `Paused` is allowed
# (microVM remains in `Paused` state).
Expand Down
2 changes: 1 addition & 1 deletion tests/integration_tests/functional/test_vsock.py
Original file line number Diff line number Diff line change
Expand Up @@ -189,7 +189,7 @@ def test_vsock_transport_reset_h2g(
response = worker.sock.recv(32)
assert (
response == b""
), f"Connection not closed: response recieved '{response.decode('utf-8')}'"
), f"Connection not closed: response received '{response.decode('utf-8')}'"
except (SocketTimeout, ConnectionResetError, BrokenPipeError):
pass

Expand Down
Loading