From c47960b9e4ae7c351f4cff58b44dc7961d0cb255 Mon Sep 17 00:00:00 2001
From: Nicolas Ruflin <spam@ruflin.com>
Date: Tue, 8 Jan 2019 11:50:23 +0100
Subject: [PATCH] Fix and reenable ml tests (#9942)

In https://github.com/elastic/beats/pull/9892 the build was broken by removing the symlink to the generated kibana files which broke the ml tests. This fixes the test by pointing to the new directory under build/kibana.

Closes https://github.com/elastic/beats/issues/9938
---
 filebeat/module/iis/error/test/ipv6_zone_id.log-expected.json | 3 ++-
 filebeat/tests/system/test_ml.py                              | 3 +--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/filebeat/module/iis/error/test/ipv6_zone_id.log-expected.json b/filebeat/module/iis/error/test/ipv6_zone_id.log-expected.json
index 99c1a3bd093..1bf44c68069 100644
--- a/filebeat/module/iis/error/test/ipv6_zone_id.log-expected.json
+++ b/filebeat/module/iis/error/test/ipv6_zone_id.log-expected.json
@@ -2,8 +2,9 @@
     {
         "@timestamp": "2018-12-30T14:22:07.000Z",
         "ecs.version": "1.0.0-beta2",
-        "event.dataset": "error",
+        "event.dataset": "iis.error",
         "event.module": "iis",
+        "fileset.name": "error",
         "iis.error.queue_name": "-",
         "iis.error.reason_phrase": "Timer_ConnectionIdle",
         "iis.error.remote_ip": "::1%0",
diff --git a/filebeat/tests/system/test_ml.py b/filebeat/tests/system/test_ml.py
index cd6e705dd42..d6f69356662 100644
--- a/filebeat/tests/system/test_ml.py
+++ b/filebeat/tests/system/test_ml.py
@@ -23,7 +23,7 @@ def init(self):
                                             "/../../../../module")
 
         self.kibana_path = os.path.abspath(self.working_dir +
-                                           "/../../../../_meta/kibana.generated")
+                                           "/../../../../build/kibana")
 
         self.filebeat = os.path.abspath(self.working_dir +
                                         "/../../../../filebeat.test")
@@ -41,7 +41,6 @@ def init(self):
     @unittest.skipIf(os.getenv("TESTING_ENVIRONMENT") == "2x",
                      "integration test not available on 2.x")
     @unittest.skipIf(os.name == "nt", "skipped on Windows")
-    @unittest.skip("Skip broken ML support.")
     def test_ml_setup(self, setup_flag, modules_flag):
         """ Test ML are installed in all possible ways """
         self._run_ml_test(setup_flag, modules_flag)