move dashboard tests to common_tests

elastic · Oct 20, 2021 · 3710e4e · 3710e4e
1 parent 2fc1d7d
commit 3710e4e
Show file tree

Hide file tree

Showing 5 changed files with 51 additions and 78 deletions.
diff --git a/auditbeat/tests/system/test_base.py b/auditbeat/tests/system/test_base.py
@@ -9,7 +9,7 @@
 from beat import common_tests
 
 
-class Test(BaseTest, common_tests.TestExportsMixin):
+class Test(BaseTest, common_tests.TestExportsMixin, common_tests.TestDashboardMixin):
     def test_start_stop(self):
         """
         Auditbeat starts and stops without error.

diff --git a/filebeat/tests/system/test_base.py b/filebeat/tests/system/test_base.py
@@ -10,7 +10,7 @@
 from beat import common_tests
 
 
-class Test(BaseTest, common_tests.TestExportsMixin):
+class Test(BaseTest, common_tests.TestExportsMixin, common_tests.TestDashboardMixin):
 
     def test_base(self):
         """
@@ -62,40 +62,3 @@ def test_template_migration(self):
         assert self.log_contains('Loaded index template')
         assert len(es.cat.templates(name='filebeat-*', h='name')) > 0
 
-    @unittest.skipUnless(INTEGRATION_TESTS, "integration test")
-    @pytest.mark.timeout(5*60, func_only=True)
-    def test_dashboards(self):
-        """
-        Test that the dashboards can be loaded with `setup --dashboards`
-        """
-        if not self.is_saved_object_api_available():
-            raise unittest.SkipTest(
-                "Kibana Saved Objects API is used since 7.15")
-
-        shutil.copytree(self.kibana_dir(), os.path.join(self.working_dir, "kibana"))
-
-        es = Elasticsearch([self.get_elasticsearch_url()])
-        self.render_config_template(
-            elasticsearch={"host": self.get_elasticsearch_url()},
-            kibana={"host": self.get_kibana_url()},
-        )
-        exit_code = self.run_beat(extra_args=["setup", "--dashboards"])
-
-        assert exit_code == 0, 'Error output: ' + self.get_log()
-        assert self.log_contains("Kibana dashboards successfully loaded.")
-
-    def is_saved_object_api_available(self):
-        kibana_semver = semver.VersionInfo.parse(self.get_version())
-        return semver.VersionInfo.parse("7.14.0") <= kibana_semver
-
-    def get_version(self):
-        url = self.get_kibana_url() + "/api/status"
-
-        r = requests.get(url)
-        body = r.json()
-        version = body["version"]["number"]
-
-        return version
-
-    def kibana_dir(self):
-        return os.path.join(self.beat_path, "build", "kibana")
diff --git a/libbeat/tests/system/beat/common_tests.py b/libbeat/tests/system/beat/common_tests.py
@@ -1,7 +1,13 @@
 import json
+import os
+import pytest
+import requests
+import semver
+import shutil
 import unittest
 import yaml
 
+from elasticsearch import Elasticsearch
 from beat.beat import INTEGRATION_TESTS
 
 # Fail if the exported index pattern is larger than 10MiB
@@ -87,3 +93,43 @@ def test_export_config(self):
         output = self.run_export_cmd("config")
         yml = yaml.load(output, Loader=yaml.FullLoader)
         assert isinstance(yml, dict)
+
+class TestDashboardMixin:
+
+    @unittest.skipUnless(INTEGRATION_TESTS, "integration test")
+    @pytest.mark.timeout(5*60, func_only=True)
+    def test_dashboards(self):
+        """
+        Test that the dashboards can be loaded with `setup --dashboards`
+        """
+        if not self.is_saved_object_api_available():
+            raise unittest.SkipTest(
+                "Kibana Saved Objects API is used since 7.15")
+
+        shutil.copytree(self.kibana_dir(), os.path.join(self.working_dir, "kibana"))
+
+        es = Elasticsearch([self.get_elasticsearch_url()])
+        self.render_config_template(
+            elasticsearch={"host": self.get_elasticsearch_url()},
+            kibana={"host": self.get_kibana_url()},
+        )
+        exit_code = self.run_beat(extra_args=["setup", "--dashboards"])
+
+        assert exit_code == 0, 'Error output: ' + self.get_log()
+        assert self.log_contains("Kibana dashboards successfully loaded.")
+
+    def is_saved_object_api_available(self):
+        kibana_semver = semver.VersionInfo.parse(self.get_version())
+        return semver.VersionInfo.parse("7.14.0") <= kibana_semver
+
+    def get_version(self):
+        url = self.get_kibana_url() + "/api/status"
+
+        r = requests.get(url)
+        body = r.json()
+        version = body["version"]["number"]
+
+        return version
+
+    def kibana_dir(self):
+        return os.path.join(self.beat_path, "build", "kibana")
diff --git a/metricbeat/tests/system/test_base.py b/metricbeat/tests/system/test_base.py
@@ -14,7 +14,7 @@
 from elasticsearch import Elasticsearch
 
 
-class Test(BaseTest, common_tests.TestExportsMixin):
+class Test(BaseTest, common_tests.TestExportsMixin, common_tests.TestDashboardMixin):
 
     COMPOSE_SERVICES = ['elasticsearch', 'kibana']
 

diff --git a/packetbeat/tests/system/test_base.py b/packetbeat/tests/system/test_base.py
@@ -11,42 +11,6 @@
 from packetbeat import BaseTest
 
 
-class Test(BaseTest, common_tests.TestExportsMixin):
+class Test(BaseTest, common_tests.TestExportsMixin, common_tests.TestDashboardMixin):
+    pass
 
-    @unittest.skipUnless(INTEGRATION_TESTS, "integration test")
-    @pytest.mark.timeout(5*60, func_only=True)
-    def test_dashboards(self):
-        """
-        Test that the dashboards can be loaded with `setup --dashboards`
-        """
-        if not self.is_saved_object_api_available():
-            raise unittest.SkipTest(
-                "Kibana Saved Objects API is used since 7.15")
-
-        shutil.copytree(self.kibana_dir(), os.path.join(self.working_dir, "kibana"))
-
-        es = Elasticsearch([self.get_elasticsearch_url()])
-        self.render_config_template(
-            elasticsearch={"host": self.get_elasticsearch_url()},
-            kibana={"host": self.get_kibana_url()},
-        )
-        exit_code = self.run_beat(extra_args=["setup", "--dashboards"])
-
-        assert exit_code == 0, 'Error output: ' + self.get_log()
-        assert self.log_contains("Kibana dashboards successfully loaded.")
-
-    def is_saved_object_api_available(self):
-        kibana_semver = semver.VersionInfo.parse(self.get_version())
-        return semver.VersionInfo.parse("7.14.0") <= kibana_semver
-
-    def get_version(self):
-        url = self.get_kibana_url() + "/api/status"
-
-        r = requests.get(url)
-        body = r.json()
-        version = body["version"]["number"]
-
-        return version
-
-    def kibana_dir(self):
-        return os.path.join(self.beat_path, "build", "kibana")