more refactoring

elastic · Oct 13, 2020 · a44de9b · a44de9b
1 parent 1285d15
commit a44de9b
Showing 1 changed file with 13 additions and 14 deletions.
diff --git a/filebeat/input/filestream/prospector_test.go b/filebeat/input/filestream/prospector_test.go
@@ -91,19 +91,14 @@ func TestProspectorNewAndUpdatedFiles(t *testing.T) {
 		test := test
 
 		t.Run(name, func(t *testing.T) {
-			pathIdentifier, err := newPathIdentifier(nil)
-			if err != nil {
-				t.Fatal(err)
-			}
-
 			p := fileProspector{
 				filewatcher: &mockFileWatcher{events: test.events},
-				identifier:  pathIdentifier,
+				identifier:  mustPathIdentifier(),
 				ignoreOlder: test.ignoreOlder,
 			}
-
 			ctx := input.Context{Logger: logp.L(), Cancelation: context.Background()}
 			hg := getTestHarvesterGroup()
+
 			p.Run(ctx, testStateStore(), hg)
 
 			assert.ElementsMatch(t, hg.encounteredNames, test.expectedSources)
@@ -134,18 +129,13 @@ func TestProspectorDeletedFile(t *testing.T) {
 		test := test
 
 		t.Run(name, func(t *testing.T) {
-			pathIdentifier, err := newPathIdentifier(nil)
-			if err != nil {
-				t.Fatal(err)
-			}
-
 			p := fileProspector{
 				filewatcher:  &mockFileWatcher{events: test.events},
-				identifier:   pathIdentifier,
+				identifier:   mustPathIdentifier(),
 				cleanRemoved: test.cleanRemoved,
 			}
-
 			ctx := input.Context{Logger: logp.L(), Cancelation: context.Background()}
+
 			testStore := testStateStore()
 			testStore.Set("filestream::path::/path/to/file", nil)
 
@@ -196,3 +186,12 @@ func testStateStore() *statestore.Store {
 	s, _ := statestore.NewRegistry(storetest.NewMemoryStoreBackend()).Get(pluginName)
 	return s
 }
+
+func mustPathIdentifier() fileIdentifier {
+	pathIdentifier, err := newPathIdentifier(nil)
+	if err != nil {
+		panic(err)
+	}
+	return pathIdentifier
+
+}