fix: update if current_task_id is NULL
This commit is contained in:
parent
37007956ab
commit
b5b2544654
3 changed files with 95 additions and 2 deletions
|
@ -2,5 +2,5 @@
|
||||||
<rect width="1100" height="20" fill="#555"/>
|
<rect width="1100" height="20" fill="#555"/>
|
||||||
<rect x="60" width="50" height="20" fill="#4c1"/>
|
<rect x="60" width="50" height="20" fill="#4c1"/>
|
||||||
<text x="5" y="14" fill="#fff" font-family="Verdana" font-size="11">coverage</text>
|
<text x="5" y="14" fill="#fff" font-family="Verdana" font-size="11">coverage</text>
|
||||||
<text x="70" y="14" fill="#fff" font-family="Verdana" font-size="11">58.5%</text>
|
<text x="70" y="14" fill="#fff" font-family="Verdana" font-size="11">58.4%</text>
|
||||||
</svg>
|
</svg>
|
||||||
|
|
Before Width: | Height: | Size: 341 B After Width: | Height: | Size: 341 B |
|
@ -106,7 +106,7 @@ func (s *Service) Update(force bool) error {
|
||||||
Model(&models.GitRepoAltRepoTask{}).
|
Model(&models.GitRepoAltRepoTask{}).
|
||||||
Select("1").
|
Select("1").
|
||||||
Where("alt_repo_id = ?", altRepo.ID).
|
Where("alt_repo_id = ?", altRepo.ID).
|
||||||
Where("last_task_id != current_task_id").
|
Where("last_task_id != current_task_id OR current_task_id IS NULL").
|
||||||
Limit(1).
|
Limit(1).
|
||||||
Scan(&exists).Error; err != nil {
|
Scan(&exists).Error; err != nil {
|
||||||
return err
|
return err
|
||||||
|
|
|
@ -118,6 +118,99 @@ func TestRepoService_ForceUpdate(t *testing.T) {
|
||||||
assert.Equal(t, path.Join("../../../../tasks/1", fileName), linkDest)
|
assert.Equal(t, path.Join("../../../../tasks/1", fileName), linkDest)
|
||||||
})
|
})
|
||||||
|
|
||||||
|
t.Run("Correct update (update)", func(t *testing.T) {
|
||||||
|
// PREPARE
|
||||||
|
db := prepareDb(t)
|
||||||
|
config := prepareConfig()
|
||||||
|
|
||||||
|
os.MkdirAll(config.GetUploadDir(), os.ModePerm)
|
||||||
|
|
||||||
|
taskPath := path.Join(config.GetUploadDir(), "tasks/1")
|
||||||
|
|
||||||
|
os.MkdirAll(taskPath, os.ModePerm)
|
||||||
|
defer os.RemoveAll(config.GetUploadDir())
|
||||||
|
|
||||||
|
fileName := "example-foo-1.0.0-alt1.x86_64.rpm"
|
||||||
|
|
||||||
|
source, err := os.Open(path.Join("./test_rpms", fileName))
|
||||||
|
assert.NoError(t, err)
|
||||||
|
destination, err := os.Create(path.Join(taskPath, fileName))
|
||||||
|
assert.NoError(t, err)
|
||||||
|
defer destination.Close()
|
||||||
|
_, err = io.Copy(destination, source)
|
||||||
|
assert.NoError(t, err)
|
||||||
|
|
||||||
|
source.Close()
|
||||||
|
destination.Close()
|
||||||
|
|
||||||
|
gitRepo := &models.GitRepo{
|
||||||
|
Name: "example-foo",
|
||||||
|
}
|
||||||
|
|
||||||
|
altRepo := &models.ALTRepo{
|
||||||
|
Name: "Sisyphus",
|
||||||
|
}
|
||||||
|
|
||||||
|
db.Create(&models.GitRepoAltRepoTask{
|
||||||
|
Repo: gitRepo,
|
||||||
|
ALTRepo: altRepo,
|
||||||
|
CurrentTask: nil,
|
||||||
|
LastTask: &models.Task{
|
||||||
|
Status: models.StatusCompleted,
|
||||||
|
Files: []models.RPMFile{
|
||||||
|
{
|
||||||
|
Filename: fileName,
|
||||||
|
Name: "example-foo",
|
||||||
|
Version: "1.0.0",
|
||||||
|
Release: "1",
|
||||||
|
Arch: "x86_64",
|
||||||
|
Epoch: 0,
|
||||||
|
},
|
||||||
|
},
|
||||||
|
},
|
||||||
|
})
|
||||||
|
|
||||||
|
service := reposervice.New(
|
||||||
|
db,
|
||||||
|
config,
|
||||||
|
)
|
||||||
|
|
||||||
|
// EXECUTE
|
||||||
|
err = service.Update(false)
|
||||||
|
|
||||||
|
// CHECK
|
||||||
|
assert.NoError(t, err)
|
||||||
|
// TODO: check db
|
||||||
|
repoBasePath := path.Join(config.GetUploadDir(), "repo", "Sisyphus")
|
||||||
|
x86_64BasePath := path.Join(repoBasePath, "x86_64", "base")
|
||||||
|
x86_64RPMSPath := path.Join(repoBasePath, "x86_64", "RPMS.aides")
|
||||||
|
noarchBasePath := path.Join(repoBasePath, "noarch", "base")
|
||||||
|
|
||||||
|
expectedFiles := []string{
|
||||||
|
path.Join(x86_64BasePath, "pkglist.aides"),
|
||||||
|
path.Join(x86_64BasePath, "pkglist.aides.bz2"),
|
||||||
|
path.Join(x86_64BasePath, "pkglist.aides.xz"),
|
||||||
|
path.Join(x86_64BasePath, "release"),
|
||||||
|
path.Join(x86_64BasePath, "release.aides"),
|
||||||
|
path.Join(x86_64RPMSPath, fileName),
|
||||||
|
path.Join(noarchBasePath, "pkglist.aides"),
|
||||||
|
path.Join(noarchBasePath, "pkglist.aides.bz2"),
|
||||||
|
path.Join(noarchBasePath, "pkglist.aides.xz"),
|
||||||
|
path.Join(noarchBasePath, "release"),
|
||||||
|
path.Join(noarchBasePath, "release.aides"),
|
||||||
|
}
|
||||||
|
|
||||||
|
for _, filePath := range expectedFiles {
|
||||||
|
_, err := os.Stat(filePath)
|
||||||
|
assert.NoErrorf(t, err, "Файл %s не найден", filePath)
|
||||||
|
}
|
||||||
|
|
||||||
|
rpmPath := path.Join(x86_64RPMSPath, fileName)
|
||||||
|
linkDest, err := os.Readlink(rpmPath)
|
||||||
|
assert.NoError(t, err)
|
||||||
|
assert.Equal(t, path.Join("../../../../tasks/1", fileName), linkDest)
|
||||||
|
})
|
||||||
|
|
||||||
t.Run("Do not do anything if no updates", func(t *testing.T) {
|
t.Run("Do not do anything if no updates", func(t *testing.T) {
|
||||||
// PREPARE
|
// PREPARE
|
||||||
db := prepareDb(t)
|
db := prepareDb(t)
|
||||||
|
|
Loading…
Reference in a new issue