Skip to content

test: make service-dependent tests portable #14

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
taigrr merged 4 commits into from
Jul 8, 2026
Merged

test: make service-dependent tests portable #14

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
7cfe539
test(portability): stabilize service-dependent coverage
taigrr Jun 4, 2026
cebb521
test(portability): provision user unit fixture
taigrr Jun 9, 2026
44e417e
ci(go): use latest patch toolchain for root tests
taigrr Jul 7, 2026
9bdd65f
test(systemctl): stabilize lifecycle checks
taigrr Jul 7, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions .github/workflows/ci.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ jobs:
runs-on: ubuntu-latest
strategy:
matrix:
go-version: ["1.26", "1.26.2"]
go-version: ["1.26", "1.26.4"]
steps:
- uses: actions/checkout@v4

Expand All @@ -36,10 +36,10 @@ jobs:
run: go test -race -coverprofile=coverage-user.out -covermode=atomic ./...

- name: Run tests (root)
run: sudo go test -race -coverprofile=coverage-root.out -covermode=atomic ./...
run: sudo env GOTOOLCHAIN=local "$(go env GOROOT)/bin/go" test -race -coverprofile=coverage-root.out -covermode=atomic ./...

- name: Upload coverage to Codecov
if: matrix.go-version == '1.26.2'
if: matrix.go-version == '1.26.4'
uses: codecov/codecov-action@v5
with:
files: coverage-user.out,coverage-root.out
Expand Down
148 changes: 99 additions & 49 deletions errors_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,68 +4,118 @@ import (
"context"
"errors"
"fmt"
"reflect"
"runtime"
"strings"
"testing"
"time"
)

func TestErrorFuncs(t *testing.T) {
errFuncs := []func(ctx context.Context, unit string, opts Options) error{
func(ctx context.Context, unit string, opts Options) error { return Enable(ctx, unit, opts) },
func(ctx context.Context, unit string, opts Options) error { return Disable(ctx, unit, opts) },
func(ctx context.Context, unit string, opts Options) error { return Restart(ctx, unit, opts) },
func(ctx context.Context, unit string, opts Options) error { return Start(ctx, unit, opts) },
}
errCases := []struct {
unit string
err error
opts Options
runAsUser bool
portableUserUnit := userTestUnit(t)
testCases := []struct {
name string
fn func(ctx context.Context, unit string, opts Options) error
lifecycle bool
errCases []struct {
unit string
err error
opts Options
runAsUser bool
}
}{
/* Run these tests only as an unpriviledged user */

// try nonexistant unit in user mode as user
{"nonexistant", ErrDoesNotExist, Options{UserMode: true}, true},
// try existing unit in user mode as user
{"syncthing", nil, Options{UserMode: true}, true},
// try nonexisting unit in system mode as user
{"nonexistant", ErrInsufficientPermissions, Options{UserMode: false}, true},
// try existing unit in system mode as user
{"nginx", ErrInsufficientPermissions, Options{UserMode: false}, true},

/* End user tests*/

/* Run these tests only as a superuser */

// try nonexistant unit in system mode as system
{"nonexistant", ErrDoesNotExist, Options{UserMode: false}, false},
// try existing unit in system mode as system
{"nginx", ErrBusFailure, Options{UserMode: true}, false},
// try existing unit in system mode as system
{"nginx", nil, Options{UserMode: false}, false},

/* End superuser tests*/

{
name: "Enable",
fn: func(ctx context.Context, unit string, opts Options) error { return Enable(ctx, unit, opts) },
lifecycle: false,
errCases: []struct {
unit string
err error
opts Options
runAsUser bool
}{
{"nonexistant", ErrDoesNotExist, Options{UserMode: true}, true},
{portableUserUnit, nil, Options{UserMode: true}, true},
{"nonexistant", ErrInsufficientPermissions, Options{UserMode: false}, true},
{"nginx", ErrInsufficientPermissions, Options{UserMode: false}, true},
{"nonexistant", ErrDoesNotExist, Options{UserMode: false}, false},
{"nginx", ErrBusFailure, Options{UserMode: true}, false},
{"nginx", nil, Options{UserMode: false}, false},
},
},
{
name: "Disable",
fn: func(ctx context.Context, unit string, opts Options) error { return Disable(ctx, unit, opts) },
lifecycle: false,
errCases: []struct {
unit string
err error
opts Options
runAsUser bool
}{
{"nonexistant", ErrDoesNotExist, Options{UserMode: true}, true},
{portableUserUnit, nil, Options{UserMode: true}, true},
{"nonexistant", ErrInsufficientPermissions, Options{UserMode: false}, true},
{"nginx", ErrInsufficientPermissions, Options{UserMode: false}, true},
{"nonexistant", ErrDoesNotExist, Options{UserMode: false}, false},
{"nginx", ErrBusFailure, Options{UserMode: true}, false},
{"nginx", nil, Options{UserMode: false}, false},
},
},
{
name: "Restart",
fn: func(ctx context.Context, unit string, opts Options) error { return Restart(ctx, unit, opts) },
lifecycle: true,
errCases: []struct {
unit string
err error
opts Options
runAsUser bool
}{
{"nonexistant", ErrDoesNotExist, Options{UserMode: true}, true},
{portableUserUnit, nil, Options{UserMode: true}, true},
{"nonexistant", ErrInsufficientPermissions, Options{UserMode: false}, true},
{"nginx", ErrInsufficientPermissions, Options{UserMode: false}, true},
{"nonexistant", ErrDoesNotExist, Options{UserMode: false}, false},
{"nginx", ErrBusFailure, Options{UserMode: true}, false},
{"nginx", nil, Options{UserMode: false}, false},
},
},
{
name: "Start",
fn: func(ctx context.Context, unit string, opts Options) error { return Start(ctx, unit, opts) },
lifecycle: true,
errCases: []struct {
unit string
err error
opts Options
runAsUser bool
}{
{"nonexistant", ErrDoesNotExist, Options{UserMode: true}, true},
{portableUserUnit, nil, Options{UserMode: true}, true},
{"nonexistant", ErrInsufficientPermissions, Options{UserMode: false}, true},
{"nginx", ErrInsufficientPermissions, Options{UserMode: false}, true},
{"nonexistant", ErrDoesNotExist, Options{UserMode: false}, false},
{"nginx", ErrBusFailure, Options{UserMode: true}, false},
{"nginx", nil, Options{UserMode: false}, false},
},
},
}

for _, f := range errFuncs {
fName := runtime.FuncForPC(reflect.ValueOf(f).Pointer()).Name()
fName = strings.TrimPrefix(fName, "github.com/taigrr/")
t.Run(fmt.Sprintf("Errorcheck %s", fName), func(t *testing.T) {
for _, tc := range errCases {
t.Run(fmt.Sprintf("%s as %s", tc.unit, userString), func(t *testing.T) {
if (userString == "root" || userString == "system") && tc.runAsUser {
for _, tc := range testCases {
t.Run(fmt.Sprintf("Errorcheck %s", tc.name), func(t *testing.T) {
for _, errCase := range tc.errCases {
t.Run(fmt.Sprintf("%s as %s", errCase.unit, userString), func(t *testing.T) {
if (userString == "root" || userString == "system") && errCase.runAsUser {
t.Skip("skipping user test while running as superuser")
} else if (userString != "root" && userString != "system") && !tc.runAsUser {
} else if (userString != "root" && userString != "system") && !errCase.runAsUser {
t.Skip("skipping superuser test while running as user")
}
if tc.lifecycle && errCase.runAsUser && errCase.opts.UserMode {
requireUserBus(t)
}
ctx, cancel := context.WithTimeout(context.Background(), 1*time.Second)
defer cancel()
err := f(ctx, tc.unit, tc.opts)
if !errors.Is(err, tc.err) {
t.Errorf("error is %v, but should have been %v", err, tc.err)
err := tc.fn(ctx, errCase.unit, errCase.opts)
if !errors.Is(err, errCase.err) {
t.Errorf("error is %v, but should have been %v", err, errCase.err)
}
})
}
Expand Down
2 changes: 1 addition & 1 deletion go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
module github.com/taigrr/systemctl

go 1.26.2
go 1.26.4
Loading
Loading