Disable FS event notifier test on mac.

- FSEvent order isn't predictable on mac causing frequent failures - moved test to the core module and removed duplicates since the test itself is platform independent
apache · May 27, 2024 · 4cecbf9 · 4cecbf9
1 parent 9212424
commit 4cecbf9
Show file tree

Hide file tree

Showing 5 changed files with 10 additions and 197 deletions.
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
@@ -259,9 +259,8 @@ jobs:
         if: contains(matrix.os, 'macos') == false && success()
         run: tar --zstd -xf build.tar.zst
 
-      - name: platform/masterfs.macosx
-        if: contains(matrix.os, 'macos') && success()
-        run: .github/retry.sh ant $OPTS -f platform/masterfs.macosx test
+      - name: platform/masterfs
+        run: .github/retry.sh ant $OPTS -f platform/masterfs test
 
       - name: Commit Validation tests
         run: .github/retry.sh ant $OPTS -Dcluster.config=$CLUSTER_CONFIG commit-validation
@@ -1048,12 +1047,6 @@ jobs:
       - name: platform/libs.junit4
         run: ant $OPTS -f platform/libs.junit4 test
 
-      - name: platform/masterfs
-        run: .github/retry.sh ant $OPTS -f platform/masterfs test
-
-      - name: platform/masterfs.linux
-        run: ant $OPTS -f platform/masterfs.linux test
-
       - name: platform/o.n.core
         run: ant $OPTS -f platform/o.n.core test-unit
 

diff --git a/platform/masterfs.linux/nbproject/project.xml b/platform/masterfs.linux/nbproject/project.xml
@@ -49,20 +49,6 @@
                     <compile-dependency/>
                 </dependency>
             </module-dependencies>
-            <test-dependencies>
-                <test-type>
-                    <name>unit</name>
-                    <test-dependency>
-                        <code-name-base>org.netbeans.libs.junit4</code-name-base>
-                        <compile-dependency/>
-                    </test-dependency>
-                    <test-dependency>
-                        <code-name-base>org.netbeans.modules.nbjunit</code-name-base>
-                        <recursive/>
-                        <compile-dependency/>
-                    </test-dependency>
-                </test-type>
-            </test-dependencies>
             <public-packages/>
         </data>
     </configuration>

diff --git a/...ux/test/unit/src/org/netbeans/modules/masterfs/watcher/linux/LinuxNotifier235632Test.java b/...ux/test/unit/src/org/netbeans/modules/masterfs/watcher/linux/LinuxNotifier235632Test.java
diff --git a/platform/masterfs.macosx/nbproject/project.xml b/platform/masterfs.macosx/nbproject/project.xml
@@ -49,23 +49,6 @@
                     <compile-dependency/>
                 </dependency>
             </module-dependencies>
-            <test-dependencies>
-                <test-type>
-                    <name>unit</name>
-                    <test-dependency>
-                        <code-name-base>org.netbeans.insane</code-name-base>
-                        <compile-dependency/>
-                    </test-dependency>
-                    <test-dependency>
-                        <code-name-base>org.netbeans.libs.junit4</code-name-base>
-                        <compile-dependency/>
-                    </test-dependency>
-                    <test-dependency>
-                        <code-name-base>org.netbeans.modules.nbjunit</code-name-base>
-                        <compile-dependency/>
-                    </test-dependency>
-                </test-type>
-            </test-dependencies>
             <public-packages/>
         </data>
     </configuration>

diff --git a/...terfs/watcher/macosx/OSXNotifierTest.java → ...tbeans/modules/masterfs/NotifierTest.java b/...terfs/watcher/macosx/OSXNotifierTest.java → ...tbeans/modules/masterfs/NotifierTest.java
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.netbeans.modules.masterfs.watcher.macosx;
+package org.netbeans.modules.masterfs;
 
 import java.io.File;
 import java.util.concurrent.atomic.AtomicBoolean;
@@ -36,23 +36,26 @@
 import org.openide.util.Utilities;
 
 /**
- * Test based in the LinuxNotifier235632Test test class
+ * Test for bug 235632.
+ *
+ * @author jhavlin
  * @author Hector Espert
  */
-public class OSXNotifierTest extends NbTestCase {
+public class NotifierTest extends NbTestCase {
 
     private File folder1;
     private File folder1text1Txt;
     private FileObject folder2FO;
     private FileObject folder2text2TxtFO;
 
-    public OSXNotifierTest(String name) {
+    public NotifierTest(String name) {
         super(name);
     }
 
     @Override
     public boolean canRun() {
-        return super.canRun() && Utilities.getOperatingSystem() == Utilities.OS_MAC;
+        // FSEvent order isn't predictable on mac causing frequent test failures
+        return super.canRun() && Utilities.getOperatingSystem() != Utilities.OS_MAC;
     }
 
     @Override