You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@nifi.apache.org by ma...@apache.org on 2022/06/21 11:20:35 UTC
[nifi-minifi-cpp] branch main updated: MINIFICPP-1864 Fix Splunk tests with newer container image
This is an automated email from the ASF dual-hosted git repository.
martinzink pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/nifi-minifi-cpp.git
The following commit(s) were added to refs/heads/main by this push:
new 834a2a5e7 MINIFICPP-1864 Fix Splunk tests with newer container image
834a2a5e7 is described below
commit 834a2a5e792c160e10c70f83cc105fb88cdc40ae
Author: Gabor Gyimesi <ga...@gmail.com>
AuthorDate: Tue Jun 21 11:38:15 2022 +0200
MINIFICPP-1864 Fix Splunk tests with newer container image
Closes #1355
Signed-off-by: Martin Zink <ma...@apache.org>
---
docker/test/integration/minifi/core/DockerTestCluster.py | 5 ++++-
docker/test/integration/resources/splunk-hec/Dockerfile | 2 +-
2 files changed, 5 insertions(+), 2 deletions(-)
diff --git a/docker/test/integration/minifi/core/DockerTestCluster.py b/docker/test/integration/minifi/core/DockerTestCluster.py
index 7158b7a45..09cc8c1ea 100644
--- a/docker/test/integration/minifi/core/DockerTestCluster.py
+++ b/docker/test/integration/minifi/core/DockerTestCluster.py
@@ -202,7 +202,10 @@ class DockerTestCluster(SingleNodeDockerCluster):
result_str = output.decode("utf-8")
result_lines = result_str.splitlines()
for result_line in result_lines:
- result_line_json = json.loads(result_line)
+ try:
+ result_line_json = json.loads(result_line)
+ except json.decoder.JSONDecodeError:
+ continue
if "result" not in result_line_json:
continue
if "host" in attributes:
diff --git a/docker/test/integration/resources/splunk-hec/Dockerfile b/docker/test/integration/resources/splunk-hec/Dockerfile
index 549cb9a70..af6ea5ab2 100644
--- a/docker/test/integration/resources/splunk-hec/Dockerfile
+++ b/docker/test/integration/resources/splunk-hec/Dockerfile
@@ -1,2 +1,2 @@
-FROM splunk/splunk:latest
+FROM splunk/splunk:9.0
ADD conf/default.yml /tmp/defaults/default.yml