mirror of
https://codeberg.org/forgejo/forgejo.git
synced 2025-09-14 14:57:21 +00:00
252efbda5c
After https://github.com/go-gitea/gitea/pull/22385 introduced LFS GC, it never worked due to a bug in the INI library: fields in structs embedded more than one level deep are not populated from the INI file. This PR fixes the issue by replacing the multi-level embedded struct with a single-level struct for parsing the cron.gc_lfs configuration. Added a new test for retrieving cron settings to demonstrate the bug in the INI package. --- Fix #9048 by cherrypicking the fix from Gitea Gitea PR: https://github.com/go-gitea/gitea/pull/35198 Confirmed to work on my own instance, I now see the cron schedule for gc_lfs listed in the site admin menu where it was empty before <!--start release-notes-assistant--> ## Release notes <!--URL:https://codeberg.org/forgejo/forgejo--> - Bug fixes - [PR](https://codeberg.org/forgejo/forgejo/pulls/9202): <!--number 9202 --><!--line 0 --><!--description TEZTIEdDIGlzIG5ldmVyIHJ1bm5pbmcgYmVjYXVzZSBvZiBhIGJ1ZyBpbiB0aGUgcGFyc2luZyBvZiB0aGUgSU5JIGZpbGU=-->LFS GC is never running because of a bug in the parsing of the INI file<!--description--> <!--end release-notes-assistant--> Co-authored-by: Lunny Xiao <xiaolunwen@gmail.com> Reviewed-on: https://codeberg.org/forgejo/forgejo/pulls/9202 Reviewed-by: Earl Warren <earl-warren@noreply.codeberg.org> Co-authored-by: Andrew Cassidy <drewcassidy@me.com> Co-committed-by: Andrew Cassidy <drewcassidy@me.com>
97 lines
1.9 KiB
Go
97 lines
1.9 KiB
Go
// Copyright 2020 The Gitea Authors. All rights reserved.
|
|
// SPDX-License-Identifier: MIT
|
|
|
|
package setting
|
|
|
|
import (
|
|
"testing"
|
|
|
|
"github.com/stretchr/testify/assert"
|
|
"github.com/stretchr/testify/require"
|
|
)
|
|
|
|
func Test_getCronSettings(t *testing.T) {
|
|
type BaseStruct struct {
|
|
Base bool
|
|
Second string
|
|
}
|
|
|
|
type Extended struct {
|
|
BaseStruct
|
|
Extend bool
|
|
}
|
|
|
|
iniStr := `
|
|
[cron.test]
|
|
BASE = true
|
|
SECOND = white rabbit
|
|
EXTEND = true
|
|
`
|
|
cfg, err := NewConfigProviderFromData(iniStr)
|
|
require.NoError(t, err)
|
|
|
|
extended := &Extended{
|
|
BaseStruct: BaseStruct{
|
|
Second: "queen of hearts",
|
|
},
|
|
}
|
|
|
|
_, err = getCronSettings(cfg, "test", extended)
|
|
require.NoError(t, err)
|
|
assert.True(t, extended.Base)
|
|
assert.Equal(t, "white rabbit", extended.Second)
|
|
assert.True(t, extended.Extend)
|
|
}
|
|
|
|
// Test_getCronSettings2 tests that getCronSettings can not handle two levels of embedding
|
|
func Test_getCronSettings2(t *testing.T) {
|
|
type BaseStruct struct {
|
|
Enabled bool
|
|
RunAtStart bool
|
|
Schedule string
|
|
}
|
|
|
|
type Extended struct {
|
|
BaseStruct
|
|
Extend bool
|
|
}
|
|
type Extended2 struct {
|
|
Extended
|
|
Third string
|
|
}
|
|
|
|
iniStr := `
|
|
[cron.test]
|
|
ENABLED = TRUE
|
|
RUN_AT_START = TRUE
|
|
SCHEDULE = @every 1h
|
|
EXTEND = true
|
|
THIRD = white rabbit
|
|
`
|
|
cfg, err := NewConfigProviderFromData(iniStr)
|
|
require.NoError(t, err)
|
|
|
|
extended := &Extended2{
|
|
Extended: Extended{
|
|
BaseStruct: BaseStruct{
|
|
Enabled: false,
|
|
RunAtStart: false,
|
|
Schedule: "@every 72h",
|
|
},
|
|
Extend: false,
|
|
},
|
|
Third: "black rabbit",
|
|
}
|
|
|
|
_, err = getCronSettings(cfg, "test", extended)
|
|
require.NoError(t, err)
|
|
|
|
// This confirms the first level of embedding works
|
|
assert.Equal(t, "white rabbit", extended.Third)
|
|
assert.True(t, extended.Extend)
|
|
|
|
// This confirms 2 levels of embedding doesn't work
|
|
assert.False(t, extended.Enabled)
|
|
assert.False(t, extended.RunAtStart)
|
|
assert.Equal(t, "@every 72h", extended.Schedule)
|
|
}
|