commit 54998a705e9436ddb040192c25737fb16f3e1a92
author Googler <ajurkowski@google.com> Tue Jul 19 11:03:35 2022 -0700
committer Copybara-Service <copybara-worker@google.com> Tue Jul 19 11:05:01 2022 -0700
tree 941b401ae3defe383ad68f210d4388beac72c5cc
parent 0eea1909ba6599eeb5d663a3c40c618a33c3ea50

Disable `LocalDiffAwarenessIntegrationTest` on macOS.

The tests were re-enabled in https://github.com/bazelbuild/bazel/commit/703c023e65ced03d5a58184d74892cd72a1eb5e3, but they turn out to still be flaky. Disable the tests on macOS again.

PiperOrigin-RevId: 461926109
Change-Id: Ie9e687f0b6c541c8ff73fbe9ffbe8a9f5ea727cc

src/test/java/com/google/devtools/build/lib/skyframe/LocalDiffAwarenessIntegrationTest.java

diff --git a/src/test/java/com/google/devtools/build/lib/skyframe/LocalDiffAwarenessIntegrationTest.java b/src/test/java/com/google/devtools/build/lib/skyframe/LocalDiffAwarenessIntegrationTest.java
index a446174..0cc0c50 100644
--- a/src/test/java/com/google/devtools/build/lib/skyframe/LocalDiffAwarenessIntegrationTest.java
+++ b/src/test/java/com/google/devtools/build/lib/skyframe/LocalDiffAwarenessIntegrationTest.java
@@ -16,6 +16,7 @@
 
 import static com.google.common.truth.Truth.assertThat;
 import static com.google.common.truth.Truth.assertWithMessage;
+import static com.google.common.truth.TruthJUnit.assume;
 import static org.junit.Assert.assertThrows;
 import static org.junit.Assert.fail;
 
@@ -29,6 +30,7 @@
 import com.google.devtools.build.lib.runtime.Command;
 import com.google.devtools.build.lib.runtime.WorkspaceBuilder;
 import com.google.devtools.build.lib.util.AbruptExitException;
+import com.google.devtools.build.lib.util.OS;
 import com.google.devtools.build.lib.vfs.DelegateFileSystem;
 import com.google.devtools.build.lib.vfs.FileStatus;
 import com.google.devtools.build.lib.vfs.FileSystem;
@@ -102,6 +104,8 @@
 
   @Test
   public void changedFile_detectsChange() throws Exception {
+    // TODO(b/238606809): Understand why these tests are flaky on Mac. Probably real watchfs bug?
+    assume().that(OS.getCurrent()).isNotEqualTo(OS.DARWIN);
     write("foo/BUILD", "genrule(name='foo', outs=['out'], cmd='echo hello > $@')");
     buildTarget("//foo");
     assertContents("hello", "//foo");
@@ -114,6 +118,8 @@
 
   @Test
   public void changedFile_statFails_throwsError() throws Exception {
+    // TODO(b/238606809): Understand why these tests are flaky on Mac. Probably real watchfs bug?
+    assume().that(OS.getCurrent()).isNotEqualTo(OS.DARWIN);
     write("foo/BUILD", "genrule(name='foo', outs=['out'], cmd='echo hello > $@')");
     buildTarget("//foo");
     assertContents("hello", "//foo");