From 27b52da583888d07975f213906fbf791361c3826 Mon Sep 17 00:00:00 2001 From: Joel Takvorian <jtakvori@redhat.com> Date: Wed, 11 Dec 2024 11:19:03 +0100 Subject: [PATCH] fix test --- cmd/display_loop_test.go | 1 + cmd/flow_capture.go | 9 +++++++-- cmd/flow_capture_test.go | 1 + cmd/root_test.go | 2 ++ 4 files changed, 11 insertions(+), 2 deletions(-) diff --git a/cmd/display_loop_test.go b/cmd/display_loop_test.go index b1434e17..74952eaf 100644 --- a/cmd/display_loop_test.go +++ b/cmd/display_loop_test.go @@ -7,6 +7,7 @@ import ( ) func TestDisplayLoop(t *testing.T) { + enrichment.current = 0 assert.Equal(t, []string{"None"}, enrichment.getNames()) assert.Equal(t, []string{"SrcAddr", "SrcPort", "DstAddr", "DstPort"}, enrichment.getCols()) diff --git a/cmd/flow_capture.go b/cmd/flow_capture.go index fd915caf..49b08098 100644 --- a/cmd/flow_capture.go +++ b/cmd/flow_capture.go @@ -35,7 +35,7 @@ var ( lastFlows = []config.GenericMap{} features = displayLoop{ - current: 6, + current: featureDefaultIndex, all: []displayLoopItem{ {name: "Raw"}, {name: "Standard", columns: []string{"Dir", "Interfaces", "Proto", "Dscp", "Bytes", "Packets"}}, @@ -48,7 +48,7 @@ var ( } enrichment = displayLoop{ - current: 4, + current: enrichmentDefaultIndex, all: []displayLoopItem{ {name: "None", columns: []string{"SrcAddr", "SrcPort", "DstAddr", "DstPort"}}, {name: "Zone", columns: []string{"SrcZone", "DstZone"}}, @@ -60,6 +60,11 @@ var ( } ) +const ( + featureDefaultIndex = 6 // All feats. + enrichmentDefaultIndex = 4 // Resources +) + func runFlowCapture(_ *cobra.Command, _ []string) { go func() { scanner() diff --git a/cmd/flow_capture_test.go b/cmd/flow_capture_test.go index b240cce3..33f2ce9a 100644 --- a/cmd/flow_capture_test.go +++ b/cmd/flow_capture_test.go @@ -54,6 +54,7 @@ func TestFlowTableMultipleFlows(t *testing.T) { // set display to standard without enrichment features.current = 1 + enrichment.current = 0 // set time and bytes per flow flowTime := 1704063600000 diff --git a/cmd/root_test.go b/cmd/root_test.go index 7164c8fe..a2a067b3 100644 --- a/cmd/root_test.go +++ b/cmd/root_test.go @@ -83,6 +83,8 @@ func setup() { // clear filters and previous flows regexes = []string{} lastFlows = []config.GenericMap{} + features.current = featureDefaultIndex + enrichment.current = enrichmentDefaultIndex } func resetTime() {