fix(tests): Move wait-loop for 'inotifywait' to testhelper

Sometimes the test-suite was failing because the helper already started
creating the file-structure before inotifywait was fully running. This
commit makes sure that 'inotifywait' is running and gives it some
additional time to setup it's watchers.

We're using a hardcoded sleep (of 2 seconds) here as unfortunately
github.com/pablodz/inotifywaitgo doesn't currently able to signal back
when 'inotifywait' is fully initialized.

Parital: #482

Author: rhafer

pkg/storage/fs/posix/testhelpers/helpers.go

@@ -21,12 +21,15 @@ package helpers
 import (
 	"context"
 	"fmt"
+	"log"
 	"os"
 	"path/filepath"
+	"strings"
 	"time"
 
 	"github.com/google/uuid"
 	"github.com/rs/zerolog"
+	"github.com/shirou/gopsutil/process"
 	"github.com/stretchr/testify/mock"
 	"google.golang.org/grpc"
 
@@ -228,6 +231,44 @@ func NewTestEnv(config map[string]interface{}) (*TestEnv, error) {
 	if err != nil {
 		return nil, err
 	}
+
+	// If needed, wait until inotifywait is running and has setup the watches
+	foundInotify := false
+	if o.WatchFS {
+		for range 15 {
+			// Get all running processes
+			processes, err := process.Processes()
+			if err != nil {
+				panic("could not get processes: " + err.Error())
+			}
+
+			// Search for the process named "inotifywait"
+			for _, p := range processes {
+				name, err := p.Name()
+				if err != nil {
+					log.Println(err)
+					continue
+				}
+
+				if strings.Contains(name, "inotifywait") {
+					// Give it some time to setup the watches
+					logger.Debug().Msg("waiting for inotifywait to settle...")
+					time.Sleep(5 * time.Second)
+					foundInotify = true
+					break
+				}
+			}
+			if foundInotify {
+				break
+			}
+			logger.Debug().Msg("waiting for inotifywait to start...")
+			time.Sleep(1 * time.Second)
+		}
+	}
+	if o.WatchFS && !foundInotify {
+		return nil, fmt.Errorf("inotifywait process not found but watch_fs is enabled")
+	}
+
 	aspects := aspects.Aspects{
 		Lookup:      lu,
 		Tree:        tree,
@@ -242,6 +283,7 @@ func NewTestEnv(config map[string]interface{}) (*TestEnv, error) {
 	if err != nil {
 		return nil, err
 	}
+
 	ctx := ruser.ContextSetUser(context.Background(), owner)
 
 	tmpFs, _ := fs.(*decomposedfs.Decomposedfs)

pkg/storage/fs/posix/tree/tree_suite_test.go

@@ -1,15 +1,11 @@
 package tree_test
 
 import (
-	"log"
-	"strings"
 	"testing"
-	"time"
 
 	. "github.com/onsi/ginkgo/v2"
 	. "github.com/onsi/gomega"
 	helpers "github.com/opencloud-eu/reva/v2/pkg/storage/fs/posix/testhelpers"
-	"github.com/shirou/gopsutil/process"
 )
 
 var (
@@ -27,30 +23,6 @@ var _ = SynchronizedBeforeSuite(func() {
 	})
 	Expect(err).ToNot(HaveOccurred())
 
-	Eventually(func() bool {
-		// Get all running processes
-		processes, err := process.Processes()
-		if err != nil {
-			panic("could not get processes: " + err.Error())
-		}
-
-		// Search for the process named "inotifywait"
-		for _, p := range processes {
-			name, err := p.Name()
-			if err != nil {
-				log.Println(err)
-				continue
-			}
-
-			if strings.Contains(name, "inotifywait") {
-				// Give it some time to setup the watches
-				time.Sleep(2 * time.Second)
-				return true
-			}
-		}
-		return false
-	}).Should(BeTrue())
-
 	// Set up environment with FS watching disabled
 	non_watching_env, err = helpers.NewTestEnv(map[string]any{"watch_fs": false})
 	Expect(err).ToNot(HaveOccurred())