From c9e3596386163e41ae8dda576d7de7723ccd00c8 Mon Sep 17 00:00:00 2001 From: Julian Brost Date: Tue, 8 Mar 2022 16:00:16 +0100 Subject: [PATCH 1/2] Bump icinga-testing version --- tests/go.mod | 2 +- tests/go.sum | 8 ++------ 2 files changed, 3 insertions(+), 7 deletions(-) diff --git a/tests/go.mod b/tests/go.mod index 8a6b62ba..3c57bffa 100644 --- a/tests/go.mod +++ b/tests/go.mod @@ -6,7 +6,7 @@ require ( github.com/containerd/containerd v1.5.6 // indirect github.com/go-redis/redis/v8 v8.11.3 github.com/google/uuid v1.3.0 - github.com/icinga/icinga-testing v0.0.0-20211203084126-748428acf86d + github.com/icinga/icinga-testing v0.0.0-20220309154907-12cf833da4f3 github.com/jmoiron/sqlx v1.3.4 github.com/stretchr/testify v1.7.0 go.uber.org/zap v1.19.1 diff --git a/tests/go.sum b/tests/go.sum index 32a1228b..3e48f68f 100644 --- a/tests/go.sum +++ b/tests/go.sum @@ -390,12 +390,8 @@ github.com/hashicorp/golang-lru v0.5.1/go.mod h1:/m3WP610KZHVQ1SGc6re/UDhFvYD7pJ github.com/hashicorp/hcl v1.0.0/go.mod h1:E5yfLk+7swimpb2L/Alb/PJmXilQ/rhwaUYs4T20WEQ= github.com/hpcloud/tail v1.0.0/go.mod h1:ab1qPbhIpdTxEkNHXyeSf5vhxWSCs/tWer42PpOxQnU= github.com/ianlancetaylor/demangle v0.0.0-20181102032728-5e5cf60278f6/go.mod h1:aSSvb/t6k1mPoxDqO4vJh6VOCGPwU4O0C2/Eqndh1Sc= -github.com/icinga/icinga-testing v0.0.0-20211112112017-64c69fdac3ca h1:8EXQTKEqUkmF/9/9iIQNPKT0BF2AY9/zunbpcRx+fcI= -github.com/icinga/icinga-testing v0.0.0-20211112112017-64c69fdac3ca/go.mod h1:VzB7xVUPFvAUgX1nDrheKHpQddvUIN24Sei4mLGelpo= -github.com/icinga/icinga-testing v0.0.0-20211202132752-03a8b5369d7a h1:FoaQd9W/hmnJ5V63dbKE6M8WBmkyhptR16Xp5WXzLko= -github.com/icinga/icinga-testing v0.0.0-20211202132752-03a8b5369d7a/go.mod h1:VzB7xVUPFvAUgX1nDrheKHpQddvUIN24Sei4mLGelpo= -github.com/icinga/icinga-testing v0.0.0-20211203084126-748428acf86d h1:NDqQPFq81quN4fYRmpK53wz1Jx1Pik7IBT0KoxMMsag= -github.com/icinga/icinga-testing v0.0.0-20211203084126-748428acf86d/go.mod h1:VzB7xVUPFvAUgX1nDrheKHpQddvUIN24Sei4mLGelpo= +github.com/icinga/icinga-testing v0.0.0-20220309154907-12cf833da4f3 h1:w+d7+9iXWr06sNi9p2gwKhRqLU77FdpNmFm9DVsWbl0= +github.com/icinga/icinga-testing v0.0.0-20220309154907-12cf833da4f3/go.mod h1:VzB7xVUPFvAUgX1nDrheKHpQddvUIN24Sei4mLGelpo= github.com/imdario/mergo v0.3.5/go.mod h1:2EnlNZ0deacrJVfApfmtdGgDfMuh/nq6Ok1EcJh5FfA= github.com/imdario/mergo v0.3.8/go.mod h1:2EnlNZ0deacrJVfApfmtdGgDfMuh/nq6Ok1EcJh5FfA= github.com/imdario/mergo v0.3.10/go.mod h1:jmQim1M+e3UYxmgPu/WyfjB3N3VflVyUjjjwH0dnCYA= From 9b3e52913eb0c9af82f489aad53e16cf8168f388 Mon Sep 17 00:00:00 2001 From: Julian Brost Date: Wed, 9 Mar 2022 09:53:51 +0100 Subject: [PATCH 2/2] Remove parallelism from history test This is done to prevent intermittent test failures caused by another sub-test still running that submits check results while the state history stream is checked for consistency. --- tests/history_test.go | 12 ------------ 1 file changed, 12 deletions(-) diff --git a/tests/history_test.go b/tests/history_test.go index fe140e50..98f4cf9f 100644 --- a/tests/history_test.go +++ b/tests/history_test.go @@ -150,8 +150,6 @@ func testHistory(t *testing.T, numNodes int) { client := nodes[0].IcingaClient t.Run("Acknowledgement", func(t *testing.T) { - t.Parallel() - const stream = "icinga:history:stream:acknowledgement" hostname := utils.UniqueName(t, "host") @@ -213,8 +211,6 @@ func testHistory(t *testing.T, numNodes int) { }) t.Run("Comment", func(t *testing.T) { - t.Parallel() - const stream = "icinga:history:stream:comment" type HistoryEvent struct { @@ -323,8 +319,6 @@ func testHistory(t *testing.T, numNodes int) { }) t.Run("Downtime", func(t *testing.T) { - t.Parallel() - const stream = "icinga:history:stream:downtime" type HistoryEvent struct { @@ -457,8 +451,6 @@ func testHistory(t *testing.T, numNodes int) { }) t.Run("Flapping", func(t *testing.T) { - t.Parallel() - const stream = "icinga:history:stream:flapping" hostname := utils.UniqueName(t, "host") @@ -504,8 +496,6 @@ func testHistory(t *testing.T, numNodes int) { }) t.Run("Notification", func(t *testing.T) { - t.Parallel() - const stream = "icinga:history:stream:notification" hostname := utils.UniqueName(t, "host") @@ -584,8 +574,6 @@ func testHistory(t *testing.T, numNodes int) { }) t.Run("State", func(t *testing.T) { - t.Parallel() - const stream = "icinga:history:stream:state" hostname := utils.UniqueName(t, "host")