From d0ad709b03c5e68ee013e39cd101fc38c86680d0 Mon Sep 17 00:00:00 2001
From: ethfoo <ethfoo@163.com>
Date: Wed, 17 Aug 2022 10:13:47 +0800
Subject: [PATCH] Test: sort interceptors in TestMergeDefault
---
pkg/core/reloader/reload.go | 2 --
test/configuration/pipeline_test.go | 9 +++++++++
2 files changed, 9 insertions(+), 2 deletions(-)
diff --git a/pkg/core/reloader/reload.go b/pkg/core/reloader/reload.go
index 214d801..7ab5e26 100644
--- a/pkg/core/reloader/reload.go
+++ b/pkg/core/reloader/reload.go
@@ -33,8 +33,6 @@ import (
"github.com/loggie-io/loggie/pkg/pipeline"
)
-var ErrOutOfReloadPeriod = errors.New("out of reload period")
-
type Reloader struct {
controller *control.Controller
diff --git a/test/configuration/pipeline_test.go b/test/configuration/pipeline_test.go
index 7d1b60f..a153e38 100644
--- a/test/configuration/pipeline_test.go
+++ b/test/configuration/pipeline_test.go
@@ -13,6 +13,7 @@ import (
"github.com/loggie-io/loggie/pkg/sink/codec"
"github.com/loggie-io/loggie/pkg/util/yaml"
"github.com/stretchr/testify/assert"
+ "sort"
"testing"
"time"
)
@@ -117,6 +118,14 @@ pipelines:
},
}
+ sort.Slice(pipe.Pipelines[0].Interceptors, func(i, j int) bool {
+ return pipe.Pipelines[0].Interceptors[i].Type > pipe.Pipelines[0].Interceptors[j].Type
+ })
+
+ sort.Slice(want.Pipelines[0].Interceptors, func(i, j int) bool {
+ return want.Pipelines[0].Interceptors[i].Type > want.Pipelines[0].Interceptors[j].Type
+ })
+
assert.Equal(t, want, pipe)
}
--
GitLab