yeah yeah fine

aslilac · aslilac · commit 5cf9b2516e6f · 2025-03-28T22:02:49.000Z
diff --git a/coderd/files/cache_internal_test.go b/coderd/files/cache_internal_test.go
@@ -8,12 +8,16 @@ import (
 	"testing"
 	"time"
 
-	"github.com/coder/coder/v2/testutil"
 	"github.com/google/uuid"
+	"github.com/spf13/afero"
 	"github.com/stretchr/testify/require"
 	"golang.org/x/sync/errgroup"
+
+	"github.com/coder/coder/v2/testutil"
 )
 
+var emptyFS fs.FS = afero.NewIOFS(afero.NewMemMapFs())
+
 func TestConcurrency(t *testing.T) {
 	t.Parallel()
 
@@ -23,7 +27,7 @@ func TestConcurrency(t *testing.T) {
 		// Wait long enough before returning to make sure that all of the goroutines
 		// will be waiting in line, ensuring that no one duplicated a fetch.
 		time.Sleep(testutil.IntervalMedium)
-		return nil, nil
+		return emptyFS, nil
 	})
 
 	batches := 1000
@@ -56,7 +60,7 @@ func TestRelease(t *testing.T) {
 	t.Parallel()
 
 	c := newTestCache(func(_ context.Context, _ uuid.UUID) (fs.FS, error) {
-		return nil, nil
+		return emptyFS, nil
 	})
 
 	batches := 100
@@ -69,7 +73,9 @@ func TestRelease(t *testing.T) {
 	batchSize := 10
 	for _, id := range ids {
 		for range batchSize {
-			c.Acquire(t.Context(), id)
+			fs, err := c.Acquire(t.Context(), id)
+			require.NoError(t, err)
+			require.Equal(t, emptyFS, fs)
 		}
 	}
 
diff --git a/coderd/util/lazy/valuewitherror_test.go b/coderd/util/lazy/valuewitherror_test.go
@@ -3,12 +3,15 @@ package lazy_test
 import (
 	"testing"
 
-	"github.com/coder/coder/v2/coderd/util/lazy"
 	"github.com/stretchr/testify/require"
 	"golang.org/x/xerrors"
+
+	"github.com/coder/coder/v2/coderd/util/lazy"
 )
 
 func TestLazyWithErrorOK(t *testing.T) {
+	t.Parallel()
+
 	l := lazy.NewWithError(func() (int, error) {
 		return 1, nil
 	})
@@ -19,6 +22,8 @@ func TestLazyWithErrorOK(t *testing.T) {
 }
 
 func TestLazyWithErrorErr(t *testing.T) {
+	t.Parallel()
+
 	l := lazy.NewWithError(func() (int, error) {
 		return 0, xerrors.New("oh no! everything that could went horribly wrong!")
 	})
@@ -29,6 +34,8 @@ func TestLazyWithErrorErr(t *testing.T) {
 }
 
 func TestLazyWithErrorPointers(t *testing.T) {
+	t.Parallel()
+
 	a := 1
 	l := lazy.NewWithError(func() (*int, error) {
 		return &a, nil
