исправление теста dlcache_test.go №2
Some checks failed
Pre-commit / pre-commit (push) Failing after 4m59s

This commit is contained in:
2025-08-26 23:41:33 +03:00
parent 77055aa2cb
commit 292125a8ff
5 changed files with 68 additions and 5 deletions

View File

@@ -25,7 +25,6 @@ import (
"path/filepath"
"gitea.plemya-x.ru/Plemya-x/ALR/internal/config"
"gitea.plemya-x.ru/Plemya-x/ALR/internal/utils"
)
type Config interface {
@@ -62,8 +61,8 @@ func (dc *DownloadCache) New(ctx context.Context, id string) (string, error) {
}
}
// Используем специальную функцию для создания каталогов с setgid битом
err = utils.EnsureTempDirWithRootOwner(itemPath, 0o2775)
// Создаем директорию с правильными правами (различается для prod и тестов)
err = createDir(itemPath, 0o2775)
if err != nil {
return "", err
}

View File

@@ -0,0 +1,37 @@
//go:build !test
// ALR - Any Linux Repository
// Copyright (C) 2025 The ALR Authors
//
// This program is free software: you can redistribute it and/or modify
// it under the terms of the GNU General Public License as published by
// the Free Software Foundation, either version 3 of the License, or
// (at your option) any later version.
//
// This program is distributed in the hope that it will be useful,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
// GNU General Public License for more details.
//
// You should have received a copy of the GNU General Public License
// along with this program. If not, see <http://www.gnu.org/licenses/>.
package dlcache
import (
"os"
"strings"
"gitea.plemya-x.ru/Plemya-x/ALR/internal/utils"
)
// createDir создает директорию с правильными правами для production
func createDir(itemPath string, mode os.FileMode) error {
// Используем специальную функцию для создания каталогов с setgid битом только для /tmp/alr
// В остальных случаях используем обычное создание директории
if strings.HasPrefix(itemPath, "/tmp/alr") {
return utils.EnsureTempDirWithRootOwner(itemPath, mode)
} else {
return os.MkdirAll(itemPath, mode)
}
}

View File

@@ -26,7 +26,6 @@ import (
"io"
"os"
"path/filepath"
"strings"
"testing"
"gitea.plemya-x.ru/Plemya-x/ALR/internal/config"

View File

@@ -0,0 +1,28 @@
//go:build test
// ALR - Any Linux Repository
// Copyright (C) 2025 The ALR Authors
//
// This program is free software: you can redistribute it and/or modify
// it under the terms of the GNU General Public License as published by
// the Free Software Foundation, either version 3 of the License, or
// (at your option) any later version.
//
// This program is distributed in the hope that it will be useful,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
// GNU General Public License for more details.
//
// You should have received a copy of the GNU General Public License
// along with this program. If not, see <http://www.gnu.org/licenses/>.
package dlcache
import (
"os"
)
// createDir создает директорию с обычными правами для тестирования
func createDir(itemPath string, mode os.FileMode) error {
return os.MkdirAll(itemPath, mode)
}