commit 57e0d5d4dc89c3aefafd5b7998cade12749a71b1
author Dennis Kempin <denniskempin@google.com> Wed Feb 10 12:39:57 2021 -0800
committer Commit Bot <commit-bot@chromium.org> Wed Feb 17 07:25:38 2021 +0000
tree 3ed7d250646711898dcc5fd264a7b6daa04de00c
parent 503c5abef67a7000910dd4ad608ed5e5e73f1600

Make Kokoro Happy

Fixes a clippy issue and disables the panic_safe test.

This test occasionally deadlocks (Maybe a 5% chance) when running
inside a test VM. I filed a bug to re-enable it.

BUG=b:179924844
TEST=kokoro passes

Change-Id: I6e9b5fc38e7bbab3fd4b2b8ba8cb5532dd14af7e
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/crosvm/+/2697860
Commit-Queue: Dennis Kempin <denniskempin@google.com>
Commit-Queue: Daniel Verkamp <dverkamp@chromium.org>
Auto-Submit: Dennis Kempin <denniskempin@google.com>
Reviewed-by: Daniel Verkamp <dverkamp@chromium.org>
Tested-by: kokoro <noreply+kokoro@google.com>

src/linux.rs

diff --git a/src/linux.rs b/src/linux.rs
index e68b215..52693d5 100644
--- a/src/linux.rs
+++ b/src/linux.rs
@@ -799,13 +799,6 @@
 ) -> DeviceResult {
     let jailed_wayland_path = Path::new("/wayland-0");
 
-    let wayland_socket_dirs = cfg
-        .wayland_socket_paths
-        .iter()
-        .map(|(_name, path)| path.parent())
-        .collect::<Option<Vec<_>>>()
-        .ok_or(Error::InvalidWaylandPath)?;
-
     let mut display_backends = vec![
         virtio::DisplayBackend::X(x_display),
         virtio::DisplayBackend::Stub,

sys_util/src/fork.rs

diff --git a/sys_util/src/fork.rs b/sys_util/src/fork.rs
index 0cc2a74..dff1925 100644
--- a/sys_util/src/fork.rs
+++ b/sys_util/src/fork.rs
@@ -126,7 +126,11 @@
         assert_eq!(evt_fd.read(), Ok(1));
     }
 
+    // This test can deadlock occasionally when running in the builders VM. It
+    // is disabled for now.
+    // TODO(b/179924844): Investigate the issue and re-enable
     #[test]
+    #[ignore]
     fn panic_safe() {
         let pid = getpid();
         assert_ne!(pid, 0);