diff --git a/.buildkite/pipeline_pr.py b/.buildkite/pipeline_pr.py index 552ad45b4ed..3a56e348b60 100755 --- a/.buildkite/pipeline_pr.py +++ b/.buildkite/pipeline_pr.py @@ -28,7 +28,6 @@ { "command": "./tools/devtool -y checkstyle", "label": "🪶 Style", - "depends_on": None, }, depends_on_build=False, ) @@ -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( diff --git a/tests/framework/microvm.py b/tests/framework/microvm.py index 2b23f4baff0..ff79c8f2f00 100644 --- a/tests/framework/microvm.py +++ b/tests/framework/microvm.py @@ -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") @@ -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""" @@ -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): @@ -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. diff --git a/tests/integration_tests/functional/test_pause_resume.py b/tests/integration_tests/functional/test_pause_resume.py index ab8c97ab7fb..c6dfba2cb0f 100644 --- a/tests/integration_tests/functional/test_pause_resume.py +++ b/tests/integration_tests/functional/test_pause_resume.py @@ -50,7 +50,7 @@ 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. @@ -58,7 +58,7 @@ 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() # Pausing the microVM when it is already `Paused` is allowed # (microVM remains in `Paused` state). diff --git a/tests/integration_tests/functional/test_vsock.py b/tests/integration_tests/functional/test_vsock.py index 29323feddf4..fcfddc23bbe 100644 --- a/tests/integration_tests/functional/test_vsock.py +++ b/tests/integration_tests/functional/test_vsock.py @@ -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