Setup python paths in test runner configuration (elastic#20832) (elas…

…tic#20892)

Use the python tests runner to setup python paths so each test doesn't
need to setup their own python paths.

(cherry picked from commit 42a53eb)

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'))

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
 

filebeat/conftest.py

@@ -0,0 +1,4 @@
+import os
+import sys
+
+sys.path.append(os.path.join(os.path.dirname(__file__), '../libbeat/tests/system'))

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'

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
 
 

heartbeat/conftest.py

@@ -0,0 +1,4 @@
+import os
+import sys
+
+sys.path.append(os.path.join(os.path.dirname(__file__), '../libbeat/tests/system'))

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
 

journalbeat/conftest.py

@@ -0,0 +1,4 @@
+import os
+import sys
+
+sys.path.append(os.path.join(os.path.dirname(__file__), '../libbeat/tests/system'))

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
 
 

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'))

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):
 

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"]
 

metricbeat/module/ceph/test_ceph.py

@@ -1,13 +1,11 @@
+import metricbeat
 import os
 import requests
 import sys
 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):

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"]
 

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
-
 
 @unittest.skip("See https://github.com/elastic/beats/issues/14660")
 class Test(metricbeat.BaseTest):

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):
 

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):
 

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):

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):
 

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):

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):

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"]
 

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"]
 

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"]
 

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):
 

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):

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):
 

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):
 

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):
 

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"]
 

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):
 

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",

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"]