Fix other tests

inngest · Oct 23, 2024 · 8558d8a · 8558d8a
1 parent 23440b7
commit 8558d8a
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 5 deletions.
diff --git a/expr.go b/expr.go
@@ -412,10 +412,11 @@ func (a *aggregator) Remove(ctx context.Context, eval Evaluable) error {
 		if err == ErrExpressionPartNotFound {
 			return ErrEvaluableNotFound
 		}
+
 		if err != nil {
+			_ = a.removeConstantEvaluable(ctx, eval)
 			return err
 		}
-
 		stats.Merge(s)
 	}
 
@@ -424,6 +425,7 @@ func (a *aggregator) Remove(ctx context.Context, eval Evaluable) error {
 		if err := a.removeConstantEvaluable(ctx, eval); err != nil {
 			return err
 		}
+		return nil
 	}
 
 	if stats.Slow() == 0 {

diff --git a/expr_test.go b/expr_test.go
@@ -717,15 +717,15 @@ func TestAddRemove(t *testing.T) {
 		// And remove.
 		err = e.Remove(ctx, loader.AddEval(tex(`event.data.another < "no"`)))
 		require.NoError(t, err)
-		require.Equal(t, 1, e.Len())
-		require.Equal(t, 1, e.SlowLen())
+		require.Equal(t, 2, e.SlowLen())
+		require.Equal(t, 2, e.Len())
 		require.Equal(t, 0, e.FastLen())
 
 		// And yeet out another non-existent expression
 		err = e.Remove(ctx, loader.AddEval(tex(`event.data.another != "i'm not here" && a != "b"`)))
 		require.Error(t, ErrEvaluableNotFound, err)
-		require.Equal(t, 1, e.Len())
-		require.Equal(t, 1, e.SlowLen())
+		require.Equal(t, 2, e.Len())
+		require.Equal(t, 2, e.SlowLen())
 		require.Equal(t, 0, e.FastLen())
 	})
 }