diff --git a/libbeat/tests/system/beat/common_tests.py b/libbeat/tests/system/beat/common_tests.py index 1f2c890749d..bfa4149fed1 100644 --- a/libbeat/tests/system/beat/common_tests.py +++ b/libbeat/tests/system/beat/common_tests.py @@ -21,8 +21,9 @@ def run_export_cmd(self, cmd, extra=[]): if len(extra) != 0: args += extra exit_code = self.run_beat(extra_args=args, logging_args=[]) - assert exit_code == 0 output = self.get_log() + if exit_code != 0: + raise Exception("export command returned with an error: {}".format(output)) trailer = "\nPASS\n" pos = output.rfind(trailer) if pos == -1: diff --git a/x-pack/auditbeat/tests/system/test_exports.py b/x-pack/auditbeat/tests/system/test_exports.py new file mode 100644 index 00000000000..920f2d20ba6 --- /dev/null +++ b/x-pack/auditbeat/tests/system/test_exports.py @@ -0,0 +1,12 @@ +import jinja2 +import os +import platform +import sys +import time +import unittest + +from auditbeat_xpack import * +from beat import common_tests + +class Test(AuditbeatXPackTest, common_tests.TestExportsMixin): + pass diff --git a/x-pack/functionbeat/provider/aws/aws/kinesis.go b/x-pack/functionbeat/provider/aws/aws/kinesis.go index b99d57fd83e..86d1d92959a 100644 --- a/x-pack/functionbeat/provider/aws/aws/kinesis.go +++ b/x-pack/functionbeat/provider/aws/aws/kinesis.go @@ -70,7 +70,7 @@ func (s *startingPosition) Unpack(str string) error { func (s *startingPosition) String() string { v, ok := mapStartingPositionReverse[*s] if !ok { - panic("unknown starting position: " + string(*s)) + panic("unknown starting position: " + fmt.Sprint(*s)) } return v } diff --git a/x-pack/metricbeat/tests/system/test_xpack_base.py b/x-pack/metricbeat/tests/system/test_xpack_base.py index 225ad779f0d..75eeafd0ed9 100644 --- a/x-pack/metricbeat/tests/system/test_xpack_base.py +++ b/x-pack/metricbeat/tests/system/test_xpack_base.py @@ -2,7 +2,7 @@ import xpack_metricbeat import test_base +from beat import common_tests - -class Test(xpack_metricbeat.XPackTest, test_base.Test): +class Test(xpack_metricbeat.XPackTest, test_base.Test, common_tests.TestExportsMixin): pass