temporary desable filesystem check for MacOS unit-tests (#37687)

(cherry picked from commit 3bf2a82) # Conflicts: # metricbeat/module/system/test_system.py
elastic · Jan 24, 2024 · 7c3bf8f · 7c3bf8f
1 parent 5cece73
commit 7c3bf8f
Showing 1 changed file with 4 additions and 0 deletions.
diff --git a/metricbeat/module/system/test_system.py b/metricbeat/module/system/test_system.py
@@ -281,6 +281,7 @@ def test_diskio(self):
                     self.assertCountEqual(
                         SYSTEM_DISK_HOST_FIELDS, host_disk.keys())
 
+<<<<<<< HEAD
     @ unittest.skipUnless(re.match("(?i)linux", sys.platform), "os")
     def test_diskio_linux(self):
         """
@@ -311,6 +312,9 @@ def test_diskio_linux(self):
                     SYSTEM_DISK_HOST_FIELDS, host_disk.keys())
 
     @ unittest.skipUnless(re.match("(?i)win|linux|darwin|freebsd|openbsd", sys.platform), "os")
+=======
+    @unittest.skipUnless(re.match("(?i)win|linux|freebsd|openbsd", sys.platform), "os")
+>>>>>>> 3bf2a825e9 (temporary desable filesystem check for MacOS unit-tests (#37687))
     def test_filesystem(self):
         """
         Test system/filesystem output.