fix test

Author: wxiaoguang

Makefile

@@ -148,14 +148,8 @@ SPELLCHECK_FILES := $(GO_DIRS) $(WEB_DIRS) templates options/locale/locale_en-US
 EDITORCONFIG_FILES := templates .github/workflows options/locale/locale_en-US.ini
 
 GO_SOURCES := $(wildcard *.go)
-GO_SOURCES += $(shell find $(GO_DIRS) -type f -name "*.go" ! -path modules/options/bindata.go ! -path modules/public/bindata.go ! -path modules/templates/bindata.go)
+GO_SOURCES += $(shell find $(GO_DIRS) -type f -name "*.go")
 GO_SOURCES += $(GENERATED_GO_DEST)
-GO_SOURCES_NO_BINDATA := $(GO_SOURCES)
-
-ifeq ($(filter $(TAGS_SPLIT),bindata),bindata)
-	GO_SOURCES += $(BINDATA_DEST)
-	GENERATED_GO_DEST += $(BINDATA_DEST)
-endif
 
 # Force installation of playwright dependencies by setting this flag
 ifdef DEPS_PLAYWRIGHT
@@ -267,7 +261,7 @@ endif
 .PHONY: generate-swagger
 generate-swagger: $(SWAGGER_SPEC) ## generate the swagger spec from code comments
 
-$(SWAGGER_SPEC): $(GO_SOURCES_NO_BINDATA) $(SWAGGER_SPEC_INPUT)
+$(SWAGGER_SPEC): $(GO_SOURCES) $(SWAGGER_SPEC_INPUT)
 	$(GO) run $(SWAGGER_PACKAGE) generate spec --exclude "$(SWAGGER_EXCLUDE)" --input "$(SWAGGER_SPEC_INPUT)" --output './$(SWAGGER_SPEC)'
 
 .PHONY: swagger-check
@@ -372,7 +366,7 @@ lint-go-gitea-vet: ## lint go files with gitea-vet
 .PHONY: lint-go-gopls
 lint-go-gopls: ## lint go files with gopls
 	@echo "Running gopls check..."
-	@GO=$(GO) GOPLS_PACKAGE=$(GOPLS_PACKAGE) tools/lint-go-gopls.sh $(GO_SOURCES_NO_BINDATA)
+	@GO=$(GO) GOPLS_PACKAGE=$(GOPLS_PACKAGE) tools/lint-go-gopls.sh $(GO_SOURCES)
 
 .PHONY: lint-editorconfig
 lint-editorconfig:

modules/assetfs/embed.go

@@ -27,6 +27,7 @@ type EmbeddedFile interface {
 
 type EmbeddedFileInfo interface {
 	fs.FileInfo
+	fs.DirEntry
 	GetGzipContent() ([]byte, bool)
 }
 
@@ -143,11 +144,17 @@ func (e *embeddedFS) getFileInfo(fullName string) (*embeddedFileInfo, error) {
 
 	fields := strings.Split(fullName, "/")
 	fi = e.meta().Root
-	for _, field := range fields {
-		for _, child := range fi.Children {
-			if child.BaseName == field {
-				fi = child
-				break
+	if fullName != "." {
+		found := true
+		for _, field := range fields {
+			for _, child := range fi.Children {
+				if found = child.BaseName == field; found {
+					fi = child
+					break
+				}
+			}
+			if !found {
+				return nil, fs.ErrNotExist
 			}
 		}
 	}
@@ -213,7 +220,7 @@ func (f *EmbeddedCompressedFile) Read(p []byte) (n int, err error) {
 func (f *EmbeddedFileBase) Seek(offset int64, whence int) (int64, error) {
 	switch whence {
 	case io.SeekStart:
-		f.seekPos = 0 + offset
+		f.seekPos = offset
 	case io.SeekCurrent:
 		f.seekPos += offset
 	case io.SeekEnd:
@@ -234,8 +241,6 @@ func (f *EmbeddedCompressedFile) Close() error {
 	return f.decompressor.Close()
 }
 
-var _ fs.FileInfo = (*embeddedFileInfo)(nil)
-
 func (fi *embeddedFileInfo) Name() string {
 	return fi.BaseName
 }
@@ -252,8 +257,6 @@ func (fi *embeddedFileInfo) ModTime() time.Time {
 	return fi.fs.meta().MaxModTime
 }
 
-var _ fs.DirEntry = (*embeddedFileInfo)(nil)
-
 func (fi *embeddedFileInfo) IsDir() bool {
 	return fi.Children != nil
 }
@@ -263,7 +266,7 @@ func (fi *embeddedFileInfo) Sys() any {
 }
 
 func (fi *embeddedFileInfo) Type() fs.FileMode {
-	return util.Iif[fs.FileMode](fi.IsDir(), fs.ModeDir, 0)
+	return util.Iif(fi.IsDir(), fs.ModeDir, 0)
 }
 
 func (fi *embeddedFileInfo) Info() (fs.FileInfo, error) {
@@ -294,7 +297,7 @@ func GenerateEmbedBindata(fsRootPath, outputFile string) error {
 			if dirEntry.IsDir() {
 				child := &embeddedFileInfo{
 					BaseName: dirEntry.Name(),
-					Children: []*embeddedFileInfo{},
+					Children: []*embeddedFileInfo{}, // non-nil means it's a directory
 				}
 				parent.Children = append(parent.Children, child)
 				if err = embedFiles(child, filepath.Join(fsPath, dirEntry.Name()), path.Join(embedPath, dirEntry.Name())); err != nil {

modules/assetfs/embed_test.go

@@ -27,6 +27,9 @@ func TestEmbed(t *testing.T) {
 	require.NoError(t, err)
 	efs := NewEmbeddedFS(data)
 
+	_, err = fs.ReadFile(efs, "not exist")
+	assert.ErrorIs(t, err, fs.ErrNotExist)
+
 	content, err := fs.ReadFile(efs, "a.txt")
 	require.NoError(t, err)
 	assert.Equal(t, "a", string(content))
@@ -35,7 +38,11 @@ func TestEmbed(t *testing.T) {
 	require.NoError(t, err)
 	assert.Equal(t, bytes.Repeat([]byte("a"), 1000), content)
 
-	entries, err := fs.ReadDir(efs, "foo")
+	entries, err := fs.ReadDir(efs, ".")
+	require.NoError(t, err)
+	assert.Len(t, entries, 2)
+
+	entries, err = fs.ReadDir(efs, "foo")
 	require.NoError(t, err)
 	require.Len(t, entries, 2)
 	assert.Equal(t, "bar", entries[0].Name())

modules/zstd/zstd_test.go

@@ -16,7 +16,7 @@ import (
 )
 
 func TestWriterReader(t *testing.T) {
-	testData := prepareTestData(t, 20_000_000)
+	testData := prepareTestData(t, 1_000_000)
 
 	result := bytes.NewBuffer(nil)
 
@@ -64,7 +64,7 @@ func TestWriterReader(t *testing.T) {
 }
 
 func TestSeekableWriterReader(t *testing.T) {
-	testData := prepareTestData(t, 20_000_000)
+	testData := prepareTestData(t, 2_000_000)
 
 	result := bytes.NewBuffer(nil)
 
@@ -109,15 +109,15 @@ func TestSeekableWriterReader(t *testing.T) {
 		reader, err := NewSeekableReader(assertReader)
 		require.NoError(t, err)
 
-		_, err = reader.Seek(10_000_000, io.SeekStart)
+		_, err = reader.Seek(1_000_000, io.SeekStart)
 		require.NoError(t, err)
 
 		data := make([]byte, 1000)
 		_, err = io.ReadFull(reader, data)
 		require.NoError(t, err)
 		require.NoError(t, reader.Close())
 
-		assert.Equal(t, testData[10_000_000:10_000_000+1000], data)
+		assert.Equal(t, testData[1_000_000:1_000_000+1000], data)
 
 		// Should seek 3 times,
 		// the first two times are for getting the index,