Bypass eventChan consumer if using custom consumer for tests

Sambigeara · Oct 1, 2022 · e9c1348 · e9c1348
1 parent fd95499
commit e9c1348
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 9 deletions.
diff --git a/pkg/service/crdt.go b/pkg/service/crdt.go
@@ -1604,16 +1604,18 @@ func (r *DBListRepo) startSync(ctx context.Context, replayChan chan []EventLog,
 
 	// Push to all WalFiles
 	var flushAgg, wsPubAgg []EventLog
-	go func() {
-		for {
-			select {
-			case e := <-r.eventsChan:
-				wsPubAgg = merge(wsPubAgg, []EventLog{e})
-			case <-ctx.Done():
-				return
+	if !r.isTest {
+		go func() {
+			for {
+				select {
+				case e := <-r.eventsChan:
+					wsPubAgg = merge(wsPubAgg, []EventLog{e})
+				case <-ctx.Done():
+					return
+				}
 			}
-		}
-	}()
+		}()
+	}
 	wsPublishTicker := time.NewTicker(websocketPublishDuration)
 	go func() {
 		for {

diff --git a/pkg/service/crdt_test.go b/pkg/service/crdt_test.go
@@ -591,6 +591,7 @@ func TestCRDTProcessEvent(t *testing.T) {
 
 func TestCRDTAllPermsMix(t *testing.T) {
 	repo, clearUp := setupRepo()
+	repo.isTest = true
 	repoUUID := uuid(1)
 	repo.uuid = repoUUID
 
@@ -694,6 +695,7 @@ func TestCRDTAllPermsMix(t *testing.T) {
 
 func TestCRDTAllPermsMoves(t *testing.T) {
 	repo, clearUp := setupRepo()
+	repo.isTest = true
 	repoUUID := uuid(1)
 	repo.uuid = repoUUID
 
@@ -801,6 +803,7 @@ func TestCRDTAllPermsMoves(t *testing.T) {
 
 func TestCRDTAllPermsDeletes(t *testing.T) {
 	repo, clearUp := setupRepo()
+	repo.isTest = true
 	repo.uuid = uuid(1)
 
 	exit := make(chan struct{})

diff --git a/pkg/service/service.go b/pkg/service/service.go
@@ -89,6 +89,8 @@ type DBListRepo struct {
 	finalFlushChan     chan struct{}
 
 	hasSyncedRemotes bool
+
+	isTest bool
 }
 
 // NewDBListRepo returns a pointer to a new instance of DBListRepo