mirror of
https://gitea.com/gitea/runner.git
synced 2026-11-04 14:35:32 +00:00
silverwind
d882311ec6
Removes dead code and redundant logic and consolidates tests, so there is less to read and maintain. No behavior change. 1. **act/runner**: inline single-use wrappers, compile regexes once instead of per call, embed the trampoline as a string, drop the unused legacy result of `parseActionCommand` 2. **act/container**: `sanitizeConfig` and `mergeContainerConfigs` stop returning the configs they already mutate in place, drop never-set option fields and the unused `user` parameter of `ExecWithCmdLine` 3. **act/common and cache server**: drop the unused `Trace`/`Tracef` loggers and the short SHA of `FindGitRevision`, `RegisterJob` releases through `RevokeJob` 4. **daemon, poller and reporter**: one shutdown wait for both poll modes, drop an unreachable fetch timeout branch, guard the reporter's last report time with its existing lock instead of an atomic 5. **build**: drop unused Makefile and release workflow variables, collapse the goreleaser ignore list to the same build targets 6. **tests**: fold near-duplicate tests into tables with shared setup Throughout, hand-rolled logic gives way to `cmp.Or`, `strings.Cut`, `slices` and `min`/`max`. Reviewed-on: https://gitea.com/gitea/runner/pulls/1335 Reviewed-by: bircni <[email protected]> Co-authored-by: silverwind <[email protected]>
73 lines
1.9 KiB
Go
73 lines
1.9 KiB
Go
// Copyright 2026 The Gitea Authors. All rights reserved.
|
|
// SPDX-License-Identifier: MIT
|
|
|
|
package container
|
|
|
|
import (
|
|
"testing"
|
|
|
|
specs "github.com/opencontainers/image-spec/specs-go/v1"
|
|
"github.com/stretchr/testify/assert"
|
|
"github.com/stretchr/testify/require"
|
|
)
|
|
|
|
func TestParsePlatform(t *testing.T) {
|
|
t.Run("empty input returns nil platform without error", func(t *testing.T) {
|
|
got, err := parsePlatform("")
|
|
require.NoError(t, err)
|
|
assert.Nil(t, got)
|
|
})
|
|
|
|
for input, want := range map[string]specs.Platform{
|
|
"linux/amd64": {OS: "linux", Architecture: "amd64"},
|
|
"linux/arm/v7": {OS: "linux", Architecture: "arm", Variant: "v7"},
|
|
"Linux/AMD64/V8": {OS: "linux", Architecture: "amd64", Variant: "v8"},
|
|
} {
|
|
t.Run(input, func(t *testing.T) {
|
|
got, err := parsePlatform(input)
|
|
require.NoError(t, err)
|
|
assert.Equal(t, &want, got)
|
|
})
|
|
}
|
|
|
|
for _, bad := range []string{
|
|
"amd64",
|
|
"linux",
|
|
"linux/",
|
|
"/amd64",
|
|
"/",
|
|
"//",
|
|
"linux/arm/",
|
|
"linux/arm/v7/extra",
|
|
} {
|
|
t.Run("rejects "+bad, func(t *testing.T) {
|
|
got, err := parsePlatform(bad)
|
|
require.Error(t, err)
|
|
assert.Nil(t, got)
|
|
})
|
|
}
|
|
}
|
|
|
|
func TestPlatformMatches(t *testing.T) {
|
|
for _, testcase := range []struct {
|
|
requested, image string
|
|
want bool
|
|
}{
|
|
{"linux/amd64", "linux/amd64", true},
|
|
{"linux/amd64/v1", "linux/amd64", true},
|
|
{"linux/arm64", "linux/amd64", false},
|
|
{"linux/arm64/v8", "linux/arm64", true},
|
|
{"linux/arm/v7", "linux/arm/v7", true},
|
|
{"linux/arm", "linux/arm/v7", true},
|
|
{"linux/arm/v6", "linux/arm/v7", false},
|
|
{"linux/arm", "linux/arm/v6", true},
|
|
{"windows/arm/v7", "linux/arm/v7", false},
|
|
} {
|
|
requested, err := parsePlatform(testcase.requested)
|
|
require.NoError(t, err)
|
|
image, err := parsePlatform(testcase.image)
|
|
require.NoError(t, err)
|
|
assert.Equal(t, testcase.want, platformMatches(requested, image), "%s on %s", testcase.requested, testcase.image)
|
|
}
|
|
}
|