enabled back tests

elastic · Jul 30, 2024 · d80ab3b · d80ab3b
1 parent dc0b701
commit d80ab3b
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 11 deletions.
diff --git a/auditbeat/module/file_integrity/fileinfo_test.go b/auditbeat/module/file_integrity/fileinfo_test.go
@@ -31,7 +31,7 @@ import (
 
 func TestNewMetadata(t *testing.T) {
 	// Can be removed after https://github.com/elastic/beats/issues/37701 is solved
-	skipOnBuildkiteDarwin(t, "Group check")
+	//skipOnBuildkiteDarwin(t, "Group check")
 
 	f, err := os.CreateTemp(t.TempDir(), "metadata")
 	if err != nil {
@@ -99,7 +99,7 @@ func TestNewMetadata(t *testing.T) {
 
 func TestSetUIDSetGIDBits(t *testing.T) {
 	// Can be removed after https://github.com/elastic/beats/issues/37701 is solved
-	skipOnBuildkiteDarwin(t, "Wheel permission issue")
+	//skipOnBuildkiteDarwin(t, "Wheel permission issue")
 
 	f, err := os.CreateTemp(t.TempDir(), "setuid")
 	if err != nil {

diff --git a/auditbeat/module/file_integrity/metricset_test.go b/auditbeat/module/file_integrity/metricset_test.go
@@ -65,9 +65,9 @@ func TestActions(t *testing.T) {
 	skipOnCIForDarwinAMD64(t)
 
 	// Can be removed after https://github.com/elastic/ingest-dev/issues/3016 is solved
-	skipOnBuildkiteWindows(t)
+	//skipOnBuildkiteWindows(t)
 	// Can be removed after https://github.com/elastic/ingest-dev/issues/3076 is solved
-	skipOnBuildkiteDarwinArm(t)
+	//skipOnBuildkiteDarwinArm(t)
 
 	defer abtest.SetupDataDir(t)()
 
@@ -162,9 +162,9 @@ func TestExcludedFiles(t *testing.T) {
 	skipOnCIForDarwinAMD64(t)
 
 	// Can be removed after https://github.com/elastic/ingest-dev/issues/3016 is solved
-	skipOnBuildkiteWindows(t)
+	//skipOnBuildkiteWindows(t)
 	// Can be removed after https://github.com/elastic/ingest-dev/issues/3076 is solved
-	skipOnBuildkiteDarwinArm(t)
+	//skipOnBuildkiteDarwinArm(t)
 
 	defer abtest.SetupDataDir(t)()
 
@@ -214,9 +214,9 @@ func TestIncludedExcludedFiles(t *testing.T) {
 	skipOnCIForDarwinAMD64(t)
 
 	// Can be removed after https://github.com/elastic/ingest-dev/issues/3016 is solved
-	skipOnBuildkiteWindows(t)
+	//skipOnBuildkiteWindows(t)
 	// Can be removed after https://github.com/elastic/ingest-dev/issues/3076 is solved
-	skipOnBuildkiteDarwinArm(t)
+	//skipOnBuildkiteDarwinArm(t)
 
 	defer abtest.SetupDataDir(t)()
 

diff --git a/metricbeat/module/system/test_system.py b/metricbeat/module/system/test_system.py
@@ -258,7 +258,7 @@ def test_diskio(self):
                     self.assertCountEqual(
                         SYSTEM_DISK_HOST_FIELDS, host_disk.keys())
 
-    @unittest.skipUnless(re.match("(?i)win|linux|freebsd|openbsd", sys.platform), "os")
+    @unittest.skipUnless(re.match("(?i)win|linux|darwin|freebsd|openbsd", sys.platform), "os")
     def test_filesystem(self):
         """
         Test system/filesystem output.

diff --git a/metricbeat/tests/system/test_reload.py b/metricbeat/tests/system/test_reload.py
@@ -42,8 +42,7 @@ def test_reload(self):
         self.wait_until(lambda: self.output_lines() > 0)
         proc.check_kill_and_wait()
 
-    # windows is disabled, see https://github.com/elastic/beats/issues/37841
-    @unittest.skipUnless(re.match("(?i)linux|darwin|freebsd|openbsd", sys.platform), "os")
+    @unittest.skipUnless(re.match("(?i)win|linux|darwin|freebsd|openbsd", sys.platform), "os")
     def test_start_stop(self):
         """
         Test if module is properly started and stopped