Merge branch 'master' into generate-package-fields

tests/system/apmserver.py

@@ -13,12 +13,7 @@
 from elasticsearch import Elasticsearch, NotFoundError
 import requests
 
-# Add libbeat/tests/system to the import path.
-output = subprocess.check_output(["go", "list", "-m", "-f", "{{.Path}} {{.Dir}}", "all"]).decode("utf-8")
-beats_line = [line for line in output.splitlines() if line.startswith("github.com/elastic/beats/")][0]
-beats_dir = beats_line.split(" ", 2)[1]
-sys.path.append(os.path.join(beats_dir, 'libbeat', 'tests', 'system'))
-
+import libbeat_paths
 from beat.beat import INTEGRATION_TESTS, TestCase, TimeoutError
 from helper import wait_until
 from es_helper import cleanup, default_pipelines

tests/system/libbeat_paths.py

@@ -0,0 +1,9 @@
+import os.path
+import subprocess
+import sys
+
+# Add libbeat/tests/system to the import path.
+output = subprocess.check_output(["go", "list", "-m", "-f", "{{.Path}} {{.Dir}}", "all"]).decode("utf-8")
+beats_line = [line for line in output.splitlines() if line.startswith("github.com/elastic/beats/")][0]
+beats_dir = beats_line.split(" ", 2)[1]
+sys.path.append(os.path.join(beats_dir, 'libbeat', 'tests', 'system'))

tests/system/test_tls.py

@@ -13,6 +13,7 @@
 
 INTEGRATION_TESTS = os.environ.get('INTEGRATION_TESTS', False)
 
+requests.packages.urllib3.disable_warnings(SubjectAltNameWarning)
 
 @integration_test
 class TestSecureServerBaseTest(ServerBaseTest):