Fix TestNewModuleRegistry flakiness (#30453)

Must sort filesets before comparing them, as they come from a map, so the iteration order is random. (cherry picked from commit 8ab92d8) # Conflicts: # filebeat/fileset/modules_test.go
elastic · Feb 17, 2022 · 7c2af07 · 7c2af07
1 parent 8a15f89
commit 7c2af07
Showing 1 changed file with 7 additions and 0 deletions.
diff --git a/filebeat/fileset/modules_test.go b/filebeat/fileset/modules_test.go
@@ -24,6 +24,7 @@ import (
 	"errors"
 	"fmt"
 	"path/filepath"
+	"sort"
 	"testing"
 
 	"github.com/stretchr/testify/assert"
@@ -74,6 +75,12 @@ func TestNewModuleRegistry(t *testing.T) {
 			fs := filesets[fileset]
 			assert.NotNil(t, fs)
 		}
+<<<<<<< HEAD
+=======
+		sort.Strings(filesetList)
+		sort.Strings(expectedFilesets)
+		assert.Equal(t, filesetList, expectedFilesets)
+>>>>>>> 8ab92d8e7d (Fix TestNewModuleRegistry flakiness (#30453))
 	}
 
 	for module, filesets := range reg.registry {