mirror of
https://github.com/taigrr/systemctl.git
synced 2026-03-09 00:14:38 -07:00
filterErr checked 'does not exist' before 'Interactive authentication required', so when systemd printed both (common for mask/unmask on non-installed units as a non-root user), the wrong error was returned. Reorder checks so permission, bus, and masked errors take priority over existence warnings. Add tests covering mixed-stderr scenarios. Also: - CI: install and start nginx so user + root tests pass - CI: run tests as both user and root for full coverage - Bump Go 1.26 → 1.26.1
135 lines
3.1 KiB
Go
135 lines
3.1 KiB
Go
package systemctl
|
|
|
|
import (
|
|
"errors"
|
|
"testing"
|
|
)
|
|
|
|
func TestFilterErr(t *testing.T) {
|
|
tests := []struct {
|
|
name string
|
|
stderr string
|
|
want error
|
|
}{
|
|
{
|
|
name: "empty stderr",
|
|
stderr: "",
|
|
want: nil,
|
|
},
|
|
{
|
|
name: "unit does not exist",
|
|
stderr: "Unit foo.service does not exist, proceeding anyway.",
|
|
want: ErrDoesNotExist,
|
|
},
|
|
{
|
|
name: "unit not found",
|
|
stderr: "Unit foo.service not found.",
|
|
want: ErrDoesNotExist,
|
|
},
|
|
{
|
|
name: "unit not loaded",
|
|
stderr: "Unit foo.service not loaded.",
|
|
want: ErrUnitNotLoaded,
|
|
},
|
|
{
|
|
name: "no such file or directory",
|
|
stderr: "No such file or directory",
|
|
want: ErrDoesNotExist,
|
|
},
|
|
{
|
|
name: "interactive authentication required",
|
|
stderr: "Interactive authentication required.",
|
|
want: ErrInsufficientPermissions,
|
|
},
|
|
{
|
|
name: "access denied",
|
|
stderr: "Access denied",
|
|
want: ErrInsufficientPermissions,
|
|
},
|
|
{
|
|
name: "dbus session bus address",
|
|
stderr: "Failed to connect to bus: $DBUS_SESSION_BUS_ADDRESS not set",
|
|
want: ErrBusFailure,
|
|
},
|
|
{
|
|
name: "unit is masked",
|
|
stderr: "Unit foo.service is masked.",
|
|
want: ErrMasked,
|
|
},
|
|
{
|
|
name: "generic failed",
|
|
stderr: "Failed to do something unknown",
|
|
want: ErrUnspecified,
|
|
},
|
|
{
|
|
name: "does not exist with auth required prioritizes permission error",
|
|
stderr: "Unit nginx.service does not exist, proceeding anyway.\nFailed to mask unit: Interactive authentication required.",
|
|
want: ErrInsufficientPermissions,
|
|
},
|
|
{
|
|
name: "does not exist with access denied prioritizes permission error",
|
|
stderr: "Unit foo.service does not exist, proceeding anyway.\nAccess denied",
|
|
want: ErrInsufficientPermissions,
|
|
},
|
|
{
|
|
name: "does not exist with bus failure prioritizes bus error",
|
|
stderr: "Unit foo.service does not exist, proceeding anyway.\n$DBUS_SESSION_BUS_ADDRESS not set",
|
|
want: ErrBusFailure,
|
|
},
|
|
{
|
|
name: "unrecognized warning",
|
|
stderr: "Warning: something benign happened",
|
|
want: nil,
|
|
},
|
|
}
|
|
|
|
for _, tt := range tests {
|
|
t.Run(tt.name, func(t *testing.T) {
|
|
got := filterErr(tt.stderr)
|
|
if tt.want == nil {
|
|
if got != nil {
|
|
t.Errorf("filterErr(%q) = %v, want nil", tt.stderr, got)
|
|
}
|
|
return
|
|
}
|
|
if !errors.Is(got, tt.want) {
|
|
t.Errorf("filterErr(%q) = %v, want error wrapping %v", tt.stderr, got, tt.want)
|
|
}
|
|
})
|
|
}
|
|
}
|
|
|
|
func TestHasValidUnitSuffix(t *testing.T) {
|
|
tests := []struct {
|
|
unit string
|
|
want bool
|
|
}{
|
|
{"nginx.service", true},
|
|
{"sshd.socket", true},
|
|
{"backup.timer", true},
|
|
{"dev-sda1.device", true},
|
|
{"home.mount", true},
|
|
{"dev-sda1.swap", true},
|
|
{"user.slice", true},
|
|
{"multi-user.target", true},
|
|
{"session-1.scope", true},
|
|
{"foo.automount", true},
|
|
{"backup.path", true},
|
|
{"foo.snapshot", true},
|
|
{"nginx", false},
|
|
{"", false},
|
|
{"foo.bar", false},
|
|
{"foo.services", false},
|
|
{".service", true},
|
|
}
|
|
|
|
for _, tt := range tests {
|
|
t.Run(tt.unit, func(t *testing.T) {
|
|
got := HasValidUnitSuffix(tt.unit)
|
|
if got != tt.want {
|
|
t.Errorf("HasValidUnitSuffix(%q) = %v, want %v", tt.unit, got, tt.want)
|
|
}
|
|
})
|
|
}
|
|
}
|