diff --git a/auditbeat/conftest.py b/auditbeat/conftest.py new file mode 100644 index 000000000000..060b8f8073f0 --- /dev/null +++ b/auditbeat/conftest.py @@ -0,0 +1,5 @@ +import os +import sys + +sys.path.append(os.path.join(os.path.dirname(__file__), '../libbeat/tests/system')) +sys.path.append(os.path.join(os.path.dirname(__file__), '../metricbeat/tests/system')) diff --git a/auditbeat/tests/system/auditbeat.py b/auditbeat/tests/system/auditbeat.py index 417b60fe894a..320e7da9ea6f 100644 --- a/auditbeat/tests/system/auditbeat.py +++ b/auditbeat/tests/system/auditbeat.py @@ -3,8 +3,6 @@ import sys import tempfile -sys.path.append(os.path.join(os.path.dirname(__file__), '../../../metricbeat/tests/system')) - if os.name == "nt": import win32file diff --git a/filebeat/conftest.py b/filebeat/conftest.py new file mode 100644 index 000000000000..2f3f81995598 --- /dev/null +++ b/filebeat/conftest.py @@ -0,0 +1,4 @@ +import os +import sys + +sys.path.append(os.path.join(os.path.dirname(__file__), '../libbeat/tests/system')) diff --git a/filebeat/tests/system/filebeat.py b/filebeat/tests/system/filebeat.py index 32902e3b321b..9bd796fd2108 100644 --- a/filebeat/tests/system/filebeat.py +++ b/filebeat/tests/system/filebeat.py @@ -3,9 +3,6 @@ import stat import sys -curdir = os.path.dirname(__file__) -sys.path.append(os.path.join(curdir, '../../../libbeat/tests/system')) - from beat.beat import TestCase, TimeoutError, REGEXP_TYPE default_registry_path = 'registry/filebeat' diff --git a/generator/_templates/beat/{beat}/tests/system/{beat}.py b/generator/_templates/beat/{beat}/tests/system/{beat}.py index 9cf1a5879a1e..9bd7453c6fd1 100644 --- a/generator/_templates/beat/{beat}/tests/system/{beat}.py +++ b/generator/_templates/beat/{beat}/tests/system/{beat}.py @@ -1,6 +1,5 @@ import os import sys -sys.path.append('../../vendor/github.com/elastic/beats/libbeat/tests/system') from beat.beat import TestCase diff --git a/heartbeat/conftest.py b/heartbeat/conftest.py new file mode 100644 index 000000000000..2f3f81995598 --- /dev/null +++ b/heartbeat/conftest.py @@ -0,0 +1,4 @@ +import os +import sys + +sys.path.append(os.path.join(os.path.dirname(__file__), '../libbeat/tests/system')) diff --git a/heartbeat/tests/system/heartbeat.py b/heartbeat/tests/system/heartbeat.py index 70b7faf1ac3b..388c4ac42c4f 100644 --- a/heartbeat/tests/system/heartbeat.py +++ b/heartbeat/tests/system/heartbeat.py @@ -2,10 +2,6 @@ import sys import http.server import threading - -sys.path.append(os.path.join(os.path.dirname( - __file__), '../../../libbeat/tests/system')) - from beat.beat import TestCase from time import sleep diff --git a/journalbeat/conftest.py b/journalbeat/conftest.py new file mode 100644 index 000000000000..2f3f81995598 --- /dev/null +++ b/journalbeat/conftest.py @@ -0,0 +1,4 @@ +import os +import sys + +sys.path.append(os.path.join(os.path.dirname(__file__), '../libbeat/tests/system')) diff --git a/journalbeat/tests/system/journalbeat.py b/journalbeat/tests/system/journalbeat.py index 11381395e29c..2ad3bd3c37fc 100644 --- a/journalbeat/tests/system/journalbeat.py +++ b/journalbeat/tests/system/journalbeat.py @@ -1,6 +1,5 @@ import os import sys -sys.path.append(os.path.join(os.path.dirname(__file__), '../../../libbeat/tests/system')) from beat.beat import TestCase diff --git a/metricbeat/conftest.py b/metricbeat/conftest.py new file mode 100644 index 000000000000..818eb72a9db4 --- /dev/null +++ b/metricbeat/conftest.py @@ -0,0 +1,5 @@ +import os +import sys + +sys.path.append(os.path.join(os.path.dirname(__file__), '../libbeat/tests/system')) +sys.path.append(os.path.join(os.path.dirname(__file__), './tests/system')) diff --git a/metricbeat/module/aerospike/test_aerospike.py b/metricbeat/module/aerospike/test_aerospike.py index 4c7e026ca920..d3a1e7ec2a6b 100644 --- a/metricbeat/module/aerospike/test_aerospike.py +++ b/metricbeat/module/aerospike/test_aerospike.py @@ -1,10 +1,8 @@ +import metricbeat import os import sys import unittest -sys.path.append(os.path.join(os.path.dirname(__file__), '../../tests/system')) -import metricbeat - class Test(metricbeat.BaseTest): diff --git a/metricbeat/module/apache/test_apache.py b/metricbeat/module/apache/test_apache.py index 396c60e38472..181fb73593df 100644 --- a/metricbeat/module/apache/test_apache.py +++ b/metricbeat/module/apache/test_apache.py @@ -1,15 +1,13 @@ +import metricbeat import os -import unittest -import urllib.request -import urllib.error -import urllib.parse import pytest -import time import semver import sys - -sys.path.append(os.path.join(os.path.dirname(__file__), '../../tests/system')) -import metricbeat +import time +import unittest +import urllib.error +import urllib.parse +import urllib.request APACHE_FIELDS = metricbeat.COMMON_FIELDS + ["apache"] diff --git a/metricbeat/module/ceph/test_ceph.py b/metricbeat/module/ceph/test_ceph.py index 9f9c70561f50..91bb6e56e7c4 100644 --- a/metricbeat/module/ceph/test_ceph.py +++ b/metricbeat/module/ceph/test_ceph.py @@ -1,3 +1,4 @@ +import metricbeat import os import requests import sys @@ -5,9 +6,6 @@ import unittest from parameterized import parameterized -sys.path.append(os.path.join(os.path.dirname(__file__), '../../tests/system')) -import metricbeat - @metricbeat.parameterized_with_supported_versions class Test(metricbeat.BaseTest): diff --git a/metricbeat/module/consul/test_consul.py b/metricbeat/module/consul/test_consul.py index 2702c144c3ac..c18dff5a2f1a 100644 --- a/metricbeat/module/consul/test_consul.py +++ b/metricbeat/module/consul/test_consul.py @@ -1,11 +1,9 @@ +import metricbeat import os import pytest import sys import unittest -sys.path.append(os.path.join(os.path.dirname(__file__), '../../tests/system')) -import metricbeat - CONSUL_FIELDS = metricbeat.COMMON_FIELDS + ["consul"] diff --git a/metricbeat/module/couchbase/test_couchbase.py b/metricbeat/module/couchbase/test_couchbase.py index 71c5edd92cbe..c42133233dc0 100644 --- a/metricbeat/module/couchbase/test_couchbase.py +++ b/metricbeat/module/couchbase/test_couchbase.py @@ -1,11 +1,9 @@ +import metricbeat import os import sys import unittest from parameterized import parameterized -sys.path.append(os.path.join(os.path.dirname(__file__), '../../tests/system')) -import metricbeat - class Test(metricbeat.BaseTest): diff --git a/metricbeat/module/couchdb/test_couchdb.py b/metricbeat/module/couchdb/test_couchdb.py index b7f2b539440d..c80a5f231a0d 100644 --- a/metricbeat/module/couchdb/test_couchdb.py +++ b/metricbeat/module/couchdb/test_couchdb.py @@ -1,10 +1,8 @@ +import metricbeat import os import sys import unittest -sys.path.append(os.path.join(os.path.dirname(__file__), '../../tests/system')) -import metricbeat - class Test(metricbeat.BaseTest): diff --git a/metricbeat/module/docker/test_docker.py b/metricbeat/module/docker/test_docker.py index 8eacc289358e..a7379cdbcbb1 100644 --- a/metricbeat/module/docker/test_docker.py +++ b/metricbeat/module/docker/test_docker.py @@ -1,10 +1,8 @@ +import metricbeat import os import sys import unittest -sys.path.append(os.path.join(os.path.dirname(__file__), '../../tests/system')) -import metricbeat - class Test(metricbeat.BaseTest): diff --git a/metricbeat/module/dropwizard/test_dropwizard.py b/metricbeat/module/dropwizard/test_dropwizard.py index 8e771c511c2e..1e81d70175e4 100644 --- a/metricbeat/module/dropwizard/test_dropwizard.py +++ b/metricbeat/module/dropwizard/test_dropwizard.py @@ -1,10 +1,8 @@ +import metricbeat import os import sys import unittest -sys.path.append(os.path.join(os.path.dirname(__file__), '../../tests/system')) -import metricbeat - @metricbeat.parameterized_with_supported_versions class Test(metricbeat.BaseTest): diff --git a/metricbeat/module/elasticsearch/test_elasticsearch.py b/metricbeat/module/elasticsearch/test_elasticsearch.py index 2ccf3b0fddd7..8202e6cebd46 100644 --- a/metricbeat/module/elasticsearch/test_elasticsearch.py +++ b/metricbeat/module/elasticsearch/test_elasticsearch.py @@ -1,19 +1,16 @@ +import json +import metricbeat +import os import re +import semver import sys -import os import unittest -import urllib.request import urllib.error import urllib.parse -import json -import semver +import urllib.request from elasticsearch import Elasticsearch, TransportError, client from parameterized import parameterized -sys.path.append(os.path.join(os.path.dirname(__file__), '../../tests/system')) - -import metricbeat - class Test(metricbeat.BaseTest): diff --git a/metricbeat/module/envoyproxy/test_envoyproxy.py b/metricbeat/module/envoyproxy/test_envoyproxy.py index 978283ab5b1a..b8964eb67fcc 100644 --- a/metricbeat/module/envoyproxy/test_envoyproxy.py +++ b/metricbeat/module/envoyproxy/test_envoyproxy.py @@ -1,10 +1,8 @@ +import metricbeat import os import sys import unittest -sys.path.append(os.path.join(os.path.dirname(__file__), '../../tests/system')) -import metricbeat - @metricbeat.parameterized_with_supported_versions class Test(metricbeat.BaseTest): diff --git a/metricbeat/module/etcd/test_etcd.py b/metricbeat/module/etcd/test_etcd.py index 1832f2dfe461..4cd629ee63f9 100644 --- a/metricbeat/module/etcd/test_etcd.py +++ b/metricbeat/module/etcd/test_etcd.py @@ -1,13 +1,10 @@ +import metricbeat import os import sys -import unittest import time +import unittest from parameterized import parameterized -sys.path.append(os.path.join(os.path.dirname(__file__), '../../tests/system')) - -import metricbeat - @metricbeat.parameterized_with_supported_versions class Test(metricbeat.BaseTest): diff --git a/metricbeat/module/golang/test_golang.py b/metricbeat/module/golang/test_golang.py index 5000c0de8fd8..e5b372a3a26d 100644 --- a/metricbeat/module/golang/test_golang.py +++ b/metricbeat/module/golang/test_golang.py @@ -1,10 +1,8 @@ +import metricbeat import os import sys import unittest -sys.path.append(os.path.join(os.path.dirname(__file__), '../../tests/system')) -import metricbeat - GOLANG_FIELDS = metricbeat.COMMON_FIELDS + ["golang"] diff --git a/metricbeat/module/haproxy/test_haproxy.py b/metricbeat/module/haproxy/test_haproxy.py index 39ec3cfe6d91..86dc1c1fb349 100644 --- a/metricbeat/module/haproxy/test_haproxy.py +++ b/metricbeat/module/haproxy/test_haproxy.py @@ -1,10 +1,8 @@ +import metricbeat import os import sys import unittest -sys.path.append(os.path.join(os.path.dirname(__file__), '../../tests/system')) -import metricbeat - HAPROXY_FIELDS = metricbeat.COMMON_FIELDS + ["haproxy"] diff --git a/metricbeat/module/http/test_http.py b/metricbeat/module/http/test_http.py index 92aa693552b5..792cbd86b68d 100644 --- a/metricbeat/module/http/test_http.py +++ b/metricbeat/module/http/test_http.py @@ -1,12 +1,10 @@ +import metricbeat import os import requests import sys import time import unittest -sys.path.append(os.path.join(os.path.dirname(__file__), '../../tests/system')) -import metricbeat - HTTP_FIELDS = metricbeat.COMMON_FIELDS + ["http"] diff --git a/metricbeat/module/jolokia/test_jolokia.py b/metricbeat/module/jolokia/test_jolokia.py index db6055fe91eb..aefa63c9a4cf 100644 --- a/metricbeat/module/jolokia/test_jolokia.py +++ b/metricbeat/module/jolokia/test_jolokia.py @@ -1,11 +1,9 @@ +import metricbeat import os import sys import unittest from parameterized import parameterized -sys.path.append(os.path.join(os.path.dirname(__file__), '../../tests/system')) -import metricbeat - class Test(metricbeat.BaseTest): diff --git a/metricbeat/module/kafka/test_kafka.py b/metricbeat/module/kafka/test_kafka.py index adfc8eb5978e..c57ac4b0d5a0 100644 --- a/metricbeat/module/kafka/test_kafka.py +++ b/metricbeat/module/kafka/test_kafka.py @@ -1,11 +1,9 @@ +import metricbeat import os import sys import unittest from parameterized import parameterized -sys.path.append(os.path.join(os.path.dirname(__file__), '../../tests/system')) -import metricbeat - @metricbeat.parameterized_with_supported_versions class KafkaTest(metricbeat.BaseTest): diff --git a/metricbeat/module/kibana/test_kibana.py b/metricbeat/module/kibana/test_kibana.py index cbd4f365979d..3955baf190e8 100644 --- a/metricbeat/module/kibana/test_kibana.py +++ b/metricbeat/module/kibana/test_kibana.py @@ -1,4 +1,5 @@ import json +import metricbeat import os import semver import sys @@ -7,9 +8,6 @@ import urllib.parse import urllib.request -sys.path.append(os.path.join(os.path.dirname(__file__), '../../tests/system')) -import metricbeat - class Test(metricbeat.BaseTest): diff --git a/metricbeat/module/logstash/test_logstash.py b/metricbeat/module/logstash/test_logstash.py index b526515fdf06..5c37f52057f9 100644 --- a/metricbeat/module/logstash/test_logstash.py +++ b/metricbeat/module/logstash/test_logstash.py @@ -1,4 +1,5 @@ import json +import metricbeat import os import semver import sys @@ -8,9 +9,6 @@ import urllib.parse import urllib.request -sys.path.append(os.path.join(os.path.dirname(__file__), '../../tests/system')) -import metricbeat - class Test(metricbeat.BaseTest): diff --git a/metricbeat/module/memcached/test_memcached.py b/metricbeat/module/memcached/test_memcached.py index d5858e08c02d..39f2bf2d7070 100644 --- a/metricbeat/module/memcached/test_memcached.py +++ b/metricbeat/module/memcached/test_memcached.py @@ -1,10 +1,8 @@ +import metricbeat import os import sys import unittest -sys.path.append(os.path.join(os.path.dirname(__file__), '../../tests/system')) -import metricbeat - class Test(metricbeat.BaseTest): diff --git a/metricbeat/module/mongodb/test_mongodb.py b/metricbeat/module/mongodb/test_mongodb.py index bd53edd1060d..1cfe51cb0b48 100644 --- a/metricbeat/module/mongodb/test_mongodb.py +++ b/metricbeat/module/mongodb/test_mongodb.py @@ -1,11 +1,9 @@ +import metricbeat import os import pytest import sys import unittest -sys.path.append(os.path.join(os.path.dirname(__file__), '../../tests/system')) -import metricbeat - MONGODB_FIELDS = metricbeat.COMMON_FIELDS + ["mongodb"] diff --git a/metricbeat/module/munin/test_munin.py b/metricbeat/module/munin/test_munin.py index 43f68a04e226..456b136372ea 100644 --- a/metricbeat/module/munin/test_munin.py +++ b/metricbeat/module/munin/test_munin.py @@ -1,10 +1,8 @@ +import metricbeat import os import sys import unittest -sys.path.append(os.path.join(os.path.dirname(__file__), '../../tests/system')) -import metricbeat - class Test(metricbeat.BaseTest): diff --git a/metricbeat/module/mysql/test_mysql.py b/metricbeat/module/mysql/test_mysql.py index 4a8b34728ed5..f2c59053c85b 100644 --- a/metricbeat/module/mysql/test_mysql.py +++ b/metricbeat/module/mysql/test_mysql.py @@ -1,11 +1,9 @@ +import metricbeat import os import pytest import sys import unittest -sys.path.append(os.path.join(os.path.dirname(__file__), '../../tests/system')) -import metricbeat - MYSQL_FIELDS = metricbeat.COMMON_FIELDS + ["mysql"] MYSQL_STATUS_FIELDS = ["clients", "cluster", "cpu", "keyspace", "memory", diff --git a/metricbeat/module/nats/test_nats.py b/metricbeat/module/nats/test_nats.py index 0b9e547e471d..406ee61d66d7 100644 --- a/metricbeat/module/nats/test_nats.py +++ b/metricbeat/module/nats/test_nats.py @@ -1,11 +1,8 @@ +import metricbeat import os import sys import unittest -sys.path.append(os.path.join(os.path.dirname(__file__), '../../tests/system')) -import metricbeat - - NATS_FIELDS = metricbeat.COMMON_FIELDS + ["nats"] diff --git a/metricbeat/module/php_fpm/test_phpfpm.py b/metricbeat/module/php_fpm/test_phpfpm.py index a325b62c2978..ca2eaf42a3a7 100644 --- a/metricbeat/module/php_fpm/test_phpfpm.py +++ b/metricbeat/module/php_fpm/test_phpfpm.py @@ -1,11 +1,8 @@ +import metricbeat import os import sys import unittest -sys.path.append(os.path.join(os.path.dirname(__file__), '../../tests/system')) -import metricbeat - - PHPFPM_FIELDS = metricbeat.COMMON_FIELDS + ["php_fpm"] diff --git a/metricbeat/module/postgresql/test_postgresql.py b/metricbeat/module/postgresql/test_postgresql.py index a8d286d56855..6ac3c0aa131a 100644 --- a/metricbeat/module/postgresql/test_postgresql.py +++ b/metricbeat/module/postgresql/test_postgresql.py @@ -1,11 +1,9 @@ +import metricbeat import os import pytest import sys import unittest -sys.path.append(os.path.join(os.path.dirname(__file__), '../../tests/system')) -import metricbeat - class Test(metricbeat.BaseTest): diff --git a/metricbeat/module/prometheus/test_prometheus.py b/metricbeat/module/prometheus/test_prometheus.py index e58b1138b99f..f882cedb6df9 100644 --- a/metricbeat/module/prometheus/test_prometheus.py +++ b/metricbeat/module/prometheus/test_prometheus.py @@ -1,12 +1,9 @@ +import metricbeat import os import sys import unittest -sys.path.append(os.path.join(os.path.dirname(__file__), '../../tests/system')) -import metricbeat - - PROMETHEUS_FIELDS = metricbeat.COMMON_FIELDS + ["prometheus"] diff --git a/metricbeat/module/redis/test_redis.py b/metricbeat/module/redis/test_redis.py index 1f6082b56264..cbfef13cf7b5 100644 --- a/metricbeat/module/redis/test_redis.py +++ b/metricbeat/module/redis/test_redis.py @@ -1,12 +1,10 @@ +import metricbeat import os import pytest import redis import sys import unittest -sys.path.append(os.path.join(os.path.dirname(__file__), '../../tests/system')) -import metricbeat - REDIS_FIELDS = metricbeat.COMMON_FIELDS + ["redis"] diff --git a/metricbeat/module/system/test_system.py b/metricbeat/module/system/test_system.py index 82e59e71af44..2805513183e9 100644 --- a/metricbeat/module/system/test_system.py +++ b/metricbeat/module/system/test_system.py @@ -1,12 +1,10 @@ +import getpass +import metricbeat +import os import re import six import sys import unittest -import getpass -import os - -sys.path.append(os.path.join(os.path.dirname(__file__), '../../tests/system')) -import metricbeat SYSTEM_CPU_FIELDS = ["cores", "idle.pct", "iowait.pct", "irq.pct", "nice.pct", diff --git a/metricbeat/module/traefik/test_traefik.py b/metricbeat/module/traefik/test_traefik.py index cc2cfe667d44..2752033d0235 100644 --- a/metricbeat/module/traefik/test_traefik.py +++ b/metricbeat/module/traefik/test_traefik.py @@ -1,13 +1,10 @@ +import metricbeat import os import sys -import unittest import time +import unittest from parameterized import parameterized -sys.path.append(os.path.join(os.path.dirname(__file__), '../../tests/system')) - -import metricbeat - class Test(metricbeat.BaseTest): diff --git a/metricbeat/module/uwsgi/test_uwsgi.py b/metricbeat/module/uwsgi/test_uwsgi.py index 1659a7e3e4f5..ee33228a9d19 100644 --- a/metricbeat/module/uwsgi/test_uwsgi.py +++ b/metricbeat/module/uwsgi/test_uwsgi.py @@ -1,13 +1,11 @@ import logging +import metricbeat import os import pytest import sys import unittest from parameterized import parameterized -sys.path.append(os.path.join(os.path.dirname(__file__), '../../tests/system')) -import metricbeat - logger = logging.getLogger(__name__) diff --git a/metricbeat/module/vsphere/test_vsphere.py b/metricbeat/module/vsphere/test_vsphere.py index b9e3e4709e90..c0c2b0db4bb5 100644 --- a/metricbeat/module/vsphere/test_vsphere.py +++ b/metricbeat/module/vsphere/test_vsphere.py @@ -1,10 +1,8 @@ +import metricbeat import os import sys import unittest -sys.path.append(os.path.join(os.path.dirname(__file__), '../../tests/system')) -import metricbeat - VSPHERE_FIELDS = metricbeat.COMMON_FIELDS + ["vsphere"] diff --git a/metricbeat/module/zookeeper/test_zookeeper.py b/metricbeat/module/zookeeper/test_zookeeper.py index 99184119ceaf..079c3696c4c4 100644 --- a/metricbeat/module/zookeeper/test_zookeeper.py +++ b/metricbeat/module/zookeeper/test_zookeeper.py @@ -1,11 +1,9 @@ +import metricbeat import os import pytest import sys import unittest -sys.path.append(os.path.join(os.path.dirname(__file__), '../../tests/system')) -import metricbeat - ZK_FIELDS = metricbeat.COMMON_FIELDS + ["zookeeper"] diff --git a/metricbeat/tests/system/metricbeat.py b/metricbeat/tests/system/metricbeat.py index b0a0a232b0c9..725e33c675b8 100644 --- a/metricbeat/tests/system/metricbeat.py +++ b/metricbeat/tests/system/metricbeat.py @@ -2,9 +2,6 @@ import re import sys import yaml - -sys.path.append(os.path.abspath(os.path.join(os.path.dirname(__file__), '../../../libbeat/tests/system'))) - from beat.beat import TestCase from beat.tags import tag from parameterized import parameterized_class diff --git a/packetbeat/conftest.py b/packetbeat/conftest.py new file mode 100644 index 000000000000..2f3f81995598 --- /dev/null +++ b/packetbeat/conftest.py @@ -0,0 +1,4 @@ +import os +import sys + +sys.path.append(os.path.join(os.path.dirname(__file__), '../libbeat/tests/system')) diff --git a/packetbeat/tests/system/packetbeat.py b/packetbeat/tests/system/packetbeat.py index 2243d433c4c9..32a9366ee339 100644 --- a/packetbeat/tests/system/packetbeat.py +++ b/packetbeat/tests/system/packetbeat.py @@ -2,9 +2,6 @@ import sys import subprocess import json - -sys.path.append(os.path.join(os.path.dirname(__file__), '../../../libbeat/tests/system')) - from beat.beat import TestCase from beat.beat import Proc diff --git a/packetbeat/tests/system/test_base.py b/packetbeat/tests/system/test_base.py index 959d36b39111..9ec4bc6c24f4 100644 --- a/packetbeat/tests/system/test_base.py +++ b/packetbeat/tests/system/test_base.py @@ -1,10 +1,7 @@ import os import sys -from packetbeat import BaseTest - -sys.path.append(os.path.abspath(os.path.join(os.path.dirname(__file__), '../../../libbeat/tests/system'))) - from beat import common_tests +from packetbeat import BaseTest class Test(BaseTest, common_tests.TestExportsMixin): diff --git a/winlogbeat/conftest.py b/winlogbeat/conftest.py new file mode 100644 index 000000000000..2f3f81995598 --- /dev/null +++ b/winlogbeat/conftest.py @@ -0,0 +1,4 @@ +import os +import sys + +sys.path.append(os.path.join(os.path.dirname(__file__), '../libbeat/tests/system')) diff --git a/winlogbeat/tests/system/winlogbeat.py b/winlogbeat/tests/system/winlogbeat.py index 4e297bb0c183..e869db397cae 100644 --- a/winlogbeat/tests/system/winlogbeat.py +++ b/winlogbeat/tests/system/winlogbeat.py @@ -11,8 +11,6 @@ import win32security import win32evtlogutil -sys.path.append(os.path.join(os.path.dirname(__file__), '../../../libbeat/tests/system')) - from beat.beat import TestCase PROVIDER = "WinlogbeatTestPython" diff --git a/x-pack/auditbeat/conftest.py b/x-pack/auditbeat/conftest.py new file mode 100644 index 000000000000..2f3a40d0838f --- /dev/null +++ b/x-pack/auditbeat/conftest.py @@ -0,0 +1,6 @@ +import os +import sys + +sys.path.append(os.path.join(os.path.dirname(__file__), '../../libbeat/tests/system')) +sys.path.append(os.path.join(os.path.dirname(__file__), '../../metricbeat/tests/system')) +sys.path.append(os.path.join(os.path.dirname(__file__), './tests/system')) diff --git a/x-pack/auditbeat/tests/system/auditbeat_xpack.py b/x-pack/auditbeat/tests/system/auditbeat_xpack.py index af8e5ae68fa0..8086ee52c5e3 100644 --- a/x-pack/auditbeat/tests/system/auditbeat_xpack.py +++ b/x-pack/auditbeat/tests/system/auditbeat_xpack.py @@ -1,9 +1,6 @@ import jinja2 import os import sys - -sys.path.append(os.path.abspath(os.path.join(os.path.dirname(__file__), '../../../../metricbeat/tests/system'))) - from metricbeat import BaseTest as MetricbeatTest diff --git a/x-pack/filebeat/conftest.py b/x-pack/filebeat/conftest.py new file mode 100644 index 000000000000..4592085fbd9e --- /dev/null +++ b/x-pack/filebeat/conftest.py @@ -0,0 +1,6 @@ +import os +import sys + +sys.path.append(os.path.join(os.path.dirname(__file__), '../../libbeat/tests/system')) +sys.path.append(os.path.join(os.path.dirname(__file__), '../../filebeat/tests/system')) +sys.path.append(os.path.join(os.path.dirname(__file__), './tests/system')) diff --git a/x-pack/filebeat/tests/system/test_filebeat_xpack.py b/x-pack/filebeat/tests/system/test_filebeat_xpack.py index 1890498fd0ab..7da62ca72643 100644 --- a/x-pack/filebeat/tests/system/test_filebeat_xpack.py +++ b/x-pack/filebeat/tests/system/test_filebeat_xpack.py @@ -1,11 +1,8 @@ import jinja2 import os import sys - -sys.path.append(os.path.abspath(os.path.join(os.path.dirname(__file__), '../../../../filebeat/tests/system'))) - -from filebeat import BaseTest as FilebeatTest from beat import common_tests +from filebeat import BaseTest as FilebeatTest class FilebeatXPackTest(FilebeatTest, common_tests.TestExportsMixin): diff --git a/x-pack/filebeat/tests/system/test_http_endpoint.py b/x-pack/filebeat/tests/system/test_http_endpoint.py index 5c73a8e2d19d..cfb8aa37ebf6 100644 --- a/x-pack/filebeat/tests/system/test_http_endpoint.py +++ b/x-pack/filebeat/tests/system/test_http_endpoint.py @@ -3,11 +3,8 @@ import sys import os import json -from requests.auth import HTTPBasicAuth - -sys.path.append(os.path.join(os.path.dirname(__file__), '../../../../filebeat/tests/system')) - from filebeat import BaseTest +from requests.auth import HTTPBasicAuth class Test(BaseTest): diff --git a/x-pack/filebeat/tests/system/test_xpack_modules.py b/x-pack/filebeat/tests/system/test_xpack_modules.py index 566850a4720e..e0397a998111 100644 --- a/x-pack/filebeat/tests/system/test_xpack_modules.py +++ b/x-pack/filebeat/tests/system/test_xpack_modules.py @@ -1,8 +1,5 @@ import os import sys - -sys.path.append(os.path.join(os.path.dirname(__file__), '../../../../filebeat/tests/system')) - import test_modules diff --git a/x-pack/functionbeat/conftest.py b/x-pack/functionbeat/conftest.py new file mode 100644 index 000000000000..8e1002b41e5d --- /dev/null +++ b/x-pack/functionbeat/conftest.py @@ -0,0 +1,5 @@ +import os +import sys + +sys.path.append(os.path.join(os.path.dirname(__file__), '../../libbeat/tests/system')) +sys.path.append(os.path.join(os.path.dirname(__file__), './tests/system')) diff --git a/x-pack/functionbeat/tests/system/functionbeat.py b/x-pack/functionbeat/tests/system/functionbeat.py index b2af1dbb11a4..24327363aefc 100644 --- a/x-pack/functionbeat/tests/system/functionbeat.py +++ b/x-pack/functionbeat/tests/system/functionbeat.py @@ -1,7 +1,5 @@ import os import sys - -sys.path.append(os.path.join(os.path.dirname(__file__), '../../../../libbeat/tests/system')) from beat.beat import TestCase diff --git a/x-pack/libbeat/conftest.py b/x-pack/libbeat/conftest.py new file mode 100644 index 000000000000..8c3ec5a61c5b --- /dev/null +++ b/x-pack/libbeat/conftest.py @@ -0,0 +1,4 @@ +import os +import sys + +sys.path.append(os.path.join(os.path.dirname(__file__), '../../libbeat/tests/system')) diff --git a/x-pack/libbeat/tests/system/base.py b/x-pack/libbeat/tests/system/base.py index 287a13f35029..ac2fdb84858f 100644 --- a/x-pack/libbeat/tests/system/base.py +++ b/x-pack/libbeat/tests/system/base.py @@ -1,11 +1,5 @@ import sys import os - - -sys.path.append(os.path.join(os.path.dirname(__file__), - '../../../../libbeat/tests/system')) - - from beat.beat import TestCase diff --git a/x-pack/metricbeat/conftest.py b/x-pack/metricbeat/conftest.py new file mode 100644 index 000000000000..c4b7e3833d21 --- /dev/null +++ b/x-pack/metricbeat/conftest.py @@ -0,0 +1,6 @@ +import os +import sys + +sys.path.append(os.path.join(os.path.dirname(__file__), '../../metricbeat/tests/system')) +sys.path.append(os.path.join(os.path.dirname(__file__), '../../libbeat/tests/system')) +sys.path.append(os.path.join(os.path.dirname(__file__), './tests/system')) diff --git a/x-pack/metricbeat/module/activemq/test_activemq.py b/x-pack/metricbeat/module/activemq/test_activemq.py index 278752b30898..8b3f96949641 100644 --- a/x-pack/metricbeat/module/activemq/test_activemq.py +++ b/x-pack/metricbeat/module/activemq/test_activemq.py @@ -4,8 +4,6 @@ import string import sys import unittest - -sys.path.append(os.path.join(os.path.dirname(__file__), '../../tests/system')) from xpack_metricbeat import XPackTest, metricbeat diff --git a/x-pack/metricbeat/module/appsearch/test_appsearch.py b/x-pack/metricbeat/module/appsearch/test_appsearch.py index e9f72a23123b..276c4e47f8f8 100644 --- a/x-pack/metricbeat/module/appsearch/test_appsearch.py +++ b/x-pack/metricbeat/module/appsearch/test_appsearch.py @@ -1,8 +1,6 @@ import os import sys import unittest - -sys.path.append(os.path.join(os.path.dirname(__file__), '../../tests/system')) from xpack_metricbeat import XPackTest, metricbeat diff --git a/x-pack/metricbeat/module/cockroachdb/test_cockroachdb.py b/x-pack/metricbeat/module/cockroachdb/test_cockroachdb.py index 72c3517c04e6..b348388e8f4c 100644 --- a/x-pack/metricbeat/module/cockroachdb/test_cockroachdb.py +++ b/x-pack/metricbeat/module/cockroachdb/test_cockroachdb.py @@ -1,8 +1,6 @@ import os import sys import unittest - -sys.path.append(os.path.join(os.path.dirname(__file__), '../../tests/system')) from xpack_metricbeat import XPackTest, metricbeat diff --git a/x-pack/metricbeat/module/coredns/test_coredns.py b/x-pack/metricbeat/module/coredns/test_coredns.py index e453fcdf1835..b885934ea13f 100644 --- a/x-pack/metricbeat/module/coredns/test_coredns.py +++ b/x-pack/metricbeat/module/coredns/test_coredns.py @@ -1,9 +1,6 @@ import os import sys import unittest -from xpack_metricbeat import XPackTest - -sys.path.append(os.path.join(os.path.dirname(__file__), '../../tests/system')) from xpack_metricbeat import XPackTest, metricbeat diff --git a/x-pack/metricbeat/module/ibmmq/test_ibmmq.py b/x-pack/metricbeat/module/ibmmq/test_ibmmq.py index c7e930335aab..187f548a371b 100644 --- a/x-pack/metricbeat/module/ibmmq/test_ibmmq.py +++ b/x-pack/metricbeat/module/ibmmq/test_ibmmq.py @@ -1,8 +1,6 @@ import os import sys import unittest - -sys.path.append(os.path.join(os.path.dirname(__file__), '../../tests/system')) from xpack_metricbeat import XPackTest, metricbeat diff --git a/x-pack/metricbeat/module/mssql/test_mssql.py b/x-pack/metricbeat/module/mssql/test_mssql.py index 225dde74fb2f..1f1eb1449432 100644 --- a/x-pack/metricbeat/module/mssql/test_mssql.py +++ b/x-pack/metricbeat/module/mssql/test_mssql.py @@ -2,8 +2,6 @@ import pytest import sys import unittest - -sys.path.append(os.path.join(os.path.dirname(__file__), '../../tests/system')) from xpack_metricbeat import XPackTest, metricbeat diff --git a/x-pack/metricbeat/module/openmetrics/test_openmetrics.py b/x-pack/metricbeat/module/openmetrics/test_openmetrics.py index 6e86ad3a5063..d2b9c3ba14b3 100644 --- a/x-pack/metricbeat/module/openmetrics/test_openmetrics.py +++ b/x-pack/metricbeat/module/openmetrics/test_openmetrics.py @@ -1,8 +1,6 @@ import os import sys import unittest - -sys.path.append(os.path.join(os.path.dirname(__file__), '../../tests/system')) from xpack_metricbeat import XPackTest, metricbeat diff --git a/x-pack/metricbeat/module/redisenterprise/test_redisenterprise.py b/x-pack/metricbeat/module/redisenterprise/test_redisenterprise.py index 806f7a37c7ad..17e30e58fea9 100644 --- a/x-pack/metricbeat/module/redisenterprise/test_redisenterprise.py +++ b/x-pack/metricbeat/module/redisenterprise/test_redisenterprise.py @@ -1,10 +1,8 @@ import os -from parameterized import parameterized import redis import sys import unittest - -sys.path.append(os.path.join(os.path.dirname(__file__), '../../tests/system')) +from parameterized import parameterized from xpack_metricbeat import XPackTest, metricbeat diff --git a/x-pack/metricbeat/module/sql/test_sql.py b/x-pack/metricbeat/module/sql/test_sql.py index 8a18791b386e..e091c4185db8 100644 --- a/x-pack/metricbeat/module/sql/test_sql.py +++ b/x-pack/metricbeat/module/sql/test_sql.py @@ -1,8 +1,6 @@ import os import sys import unittest - -sys.path.append(os.path.join(os.path.dirname(__file__), '../../tests/system')) from xpack_metricbeat import XPackTest, metricbeat diff --git a/x-pack/metricbeat/module/stan/test_stan.py b/x-pack/metricbeat/module/stan/test_stan.py index 8acd47984f91..11f862a31ba8 100644 --- a/x-pack/metricbeat/module/stan/test_stan.py +++ b/x-pack/metricbeat/module/stan/test_stan.py @@ -2,8 +2,6 @@ import sys import unittest from parameterized import parameterized - -sys.path.append(os.path.join(os.path.dirname(__file__), '../../tests/system')) from xpack_metricbeat import XPackTest, metricbeat STAN_FIELDS = metricbeat.COMMON_FIELDS + ["stan"] diff --git a/x-pack/metricbeat/module/statsd/test_statsd.py b/x-pack/metricbeat/module/statsd/test_statsd.py index 15d4b0513b77..927980092474 100644 --- a/x-pack/metricbeat/module/statsd/test_statsd.py +++ b/x-pack/metricbeat/module/statsd/test_statsd.py @@ -1,8 +1,6 @@ import os import socket import sys - -sys.path.append(os.path.join(os.path.dirname(__file__), '../../tests/system')) from xpack_metricbeat import XPackTest, metricbeat STATSD_HOST = '127.0.0.1' diff --git a/x-pack/metricbeat/tests/system/xpack_metricbeat.py b/x-pack/metricbeat/tests/system/xpack_metricbeat.py index 9164a3bf5291..7554c9e339a3 100644 --- a/x-pack/metricbeat/tests/system/xpack_metricbeat.py +++ b/x-pack/metricbeat/tests/system/xpack_metricbeat.py @@ -1,10 +1,7 @@ +import metricbeat import os import sys -sys.path.append(os.path.join(os.path.dirname(__file__), '../../../../metricbeat/tests/system')) - -import metricbeat - class XPackTest(metricbeat.BaseTest):