From 7c3bf8f2b2073dcdfb21fa6a92ee3132af281c82 Mon Sep 17 00:00:00 2001
From: sharbuz <87968844+sharbuz@users.noreply.github.com>
Date: Wed, 24 Jan 2024 12:39:58 +0200
Subject: [PATCH] temporary desable filesystem check for MacOS unit-tests
 (#37687)

(cherry picked from commit 3bf2a825e91ca68f6776d4794bb30ded5b75cd91)

# Conflicts:
#	metricbeat/module/system/test_system.py
---
 metricbeat/module/system/test_system.py | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/metricbeat/module/system/test_system.py b/metricbeat/module/system/test_system.py
index 9943423392ee..4ef2a5318aca 100644
--- 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.