internal/stub: move from container

This package solves a very specific stubbing use case, in a less than elegant manner.

Signed-off-by: Ophestra <cat@gensokyo.uk>

cmd/hakurei/json_test.go

@@ -5,7 +5,7 @@ import (
 	"strings"
 	"testing"
 
-	"hakurei.app/container/stub"
+	"hakurei.app/internal/stub"
 )
 
 func TestDecodeJSON(t *testing.T) {

container/autoetc_test.go

@@ -6,7 +6,7 @@ import (
 	"testing"
 
 	"hakurei.app/check"
-	"hakurei.app/container/stub"
+	"hakurei.app/internal/stub"
 )
 
 func TestAutoEtcOp(t *testing.T) {

container/autoroot_test.go

@@ -7,7 +7,7 @@ import (
 
 	"hakurei.app/check"
 	"hakurei.app/container/std"
-	"hakurei.app/container/stub"
+	"hakurei.app/internal/stub"
 	"hakurei.app/message"
 )
 

container/dispatcher_test.go

@@ -18,7 +18,7 @@ import (
 
 	"hakurei.app/container/seccomp"
 	"hakurei.app/container/std"
-	"hakurei.app/container/stub"
+	"hakurei.app/internal/stub"
 	"hakurei.app/message"
 )
 

container/errors_test.go

@@ -9,7 +9,7 @@ import (
 	"testing"
 
 	"hakurei.app/check"
-	"hakurei.app/container/stub"
+	"hakurei.app/internal/stub"
 	"hakurei.app/vfs"
 )
 

container/init_test.go

@@ -10,7 +10,7 @@ import (
 	"hakurei.app/check"
 	"hakurei.app/container/seccomp"
 	"hakurei.app/container/std"
-	"hakurei.app/container/stub"
+	"hakurei.app/internal/stub"
 )
 
 func TestInitEntrypoint(t *testing.T) {

container/initbind_test.go

@@ -8,7 +8,7 @@ import (
 
 	"hakurei.app/check"
 	"hakurei.app/container/std"
-	"hakurei.app/container/stub"
+	"hakurei.app/internal/stub"
 )
 
 func TestBindMountOp(t *testing.T) {

container/initdaemon_test.go

@@ -5,7 +5,7 @@ import (
 	"testing"
 
 	"hakurei.app/check"
-	"hakurei.app/container/stub"
+	"hakurei.app/internal/stub"
 	"hakurei.app/message"
 )
 

container/initdev_test.go

@@ -5,7 +5,7 @@ import (
 	"testing"
 
 	"hakurei.app/check"
-	"hakurei.app/container/stub"
+	"hakurei.app/internal/stub"
 )
 
 func TestMountDevOp(t *testing.T) {

container/initmkdir_test.go

@@ -5,7 +5,7 @@ import (
 	"testing"
 
 	"hakurei.app/check"
-	"hakurei.app/container/stub"
+	"hakurei.app/internal/stub"
 )
 
 func TestMkdirOp(t *testing.T) {

container/initoverlay_test.go

@@ -6,7 +6,7 @@ import (
 	"testing"
 
 	"hakurei.app/check"
-	"hakurei.app/container/stub"
+	"hakurei.app/internal/stub"
 )
 
 func TestMountOverlayOp(t *testing.T) {

container/initplace_test.go

@@ -5,7 +5,7 @@ import (
 	"testing"
 
 	"hakurei.app/check"
-	"hakurei.app/container/stub"
+	"hakurei.app/internal/stub"
 )
 
 func TestTmpfileOp(t *testing.T) {

container/initproc_test.go

@@ -5,7 +5,7 @@ import (
 	"testing"
 
 	"hakurei.app/check"
-	"hakurei.app/container/stub"
+	"hakurei.app/internal/stub"
 )
 
 func TestMountProcOp(t *testing.T) {

container/initremount_test.go

@@ -5,7 +5,7 @@ import (
 	"testing"
 
 	"hakurei.app/check"
-	"hakurei.app/container/stub"
+	"hakurei.app/internal/stub"
 )
 
 func TestRemountOp(t *testing.T) {

container/initsymlink_test.go

@@ -5,7 +5,7 @@ import (
 	"testing"
 
 	"hakurei.app/check"
-	"hakurei.app/container/stub"
+	"hakurei.app/internal/stub"
 )
 
 func TestSymlinkOp(t *testing.T) {

container/inittmpfs_test.go

@@ -6,7 +6,7 @@ import (
 	"testing"
 
 	"hakurei.app/check"
-	"hakurei.app/container/stub"
+	"hakurei.app/internal/stub"
 )
 
 func TestMountTmpfsOp(t *testing.T) {

container/mount_test.go

@@ -5,7 +5,7 @@ import (
 	"syscall"
 	"testing"
 
-	"hakurei.app/container/stub"
+	"hakurei.app/internal/stub"
 	"hakurei.app/vfs"
 )
 

hst/hst_test.go

@@ -9,8 +9,8 @@ import (
 	"syscall"
 	"testing"
 
-	"hakurei.app/container/stub"
 	"hakurei.app/hst"
+	"hakurei.app/internal/stub"
 	"hakurei.app/message"
 )
 

internal/env/env_test.go

@@ -7,10 +7,10 @@ import (
 
 	"hakurei.app/check"
 	"hakurei.app/container"
-	"hakurei.app/container/stub"
 	"hakurei.app/fhs"
 	"hakurei.app/hst"
 	"hakurei.app/internal/env"
+	"hakurei.app/internal/stub"
 )
 
 func TestPaths(t *testing.T) {

internal/outcome/dispatcher_test.go

@@ -22,8 +22,8 @@ import (
 	"hakurei.app/container"
 	"hakurei.app/container/seccomp"
 	"hakurei.app/container/std"
-	"hakurei.app/container/stub"
 	"hakurei.app/hst"
+	"hakurei.app/internal/stub"
 	"hakurei.app/internal/system"
 	"hakurei.app/message"
 )

internal/outcome/hsu_test.go

@@ -9,8 +9,8 @@ import (
 	"testing"
 	"unsafe"
 
-	"hakurei.app/container/stub"
 	"hakurei.app/hst"
+	"hakurei.app/internal/stub"
 )
 
 func TestHsu(t *testing.T) {

internal/outcome/shim_test.go

@@ -12,11 +12,11 @@ import (
 	"hakurei.app/container"
 	"hakurei.app/container/seccomp"
 	"hakurei.app/container/std"
-	"hakurei.app/container/stub"
 	"hakurei.app/ext"
 	"hakurei.app/fhs"
 	"hakurei.app/hst"
 	"hakurei.app/internal/env"
+	"hakurei.app/internal/stub"
 )
 
 func TestShimEntrypoint(t *testing.T) {

internal/outcome/spaccount_test.go

@@ -6,8 +6,8 @@ import (
 	"testing"
 
 	"hakurei.app/container"
-	"hakurei.app/container/stub"
 	"hakurei.app/hst"
+	"hakurei.app/internal/stub"
 )
 
 func TestSpAccountOp(t *testing.T) {

internal/outcome/spcontainer_test.go

@@ -11,11 +11,11 @@ import (
 	"hakurei.app/container"
 	"hakurei.app/container/seccomp"
 	"hakurei.app/container/std"
-	"hakurei.app/container/stub"
 	"hakurei.app/fhs"
 	"hakurei.app/hst"
 	"hakurei.app/internal/acl"
 	"hakurei.app/internal/dbus"
+	"hakurei.app/internal/stub"
 	"hakurei.app/internal/system"
 )
 

internal/outcome/spdbus_test.go

@@ -5,11 +5,11 @@ import (
 	"testing"
 
 	"hakurei.app/container"
-	"hakurei.app/container/stub"
 	"hakurei.app/hst"
 	"hakurei.app/internal/acl"
 	"hakurei.app/internal/dbus"
 	"hakurei.app/internal/helper"
+	"hakurei.app/internal/stub"
 	"hakurei.app/internal/system"
 	"hakurei.app/message"
 )

internal/outcome/sppipewire_test.go

@@ -4,9 +4,9 @@ import (
 	"testing"
 
 	"hakurei.app/container"
-	"hakurei.app/container/stub"
 	"hakurei.app/hst"
 	"hakurei.app/internal/pipewire"
+	"hakurei.app/internal/stub"
 	"hakurei.app/internal/system"
 )
 

internal/outcome/sppulse_test.go

@@ -9,9 +9,9 @@ import (
 
 	"hakurei.app/check"
 	"hakurei.app/container"
-	"hakurei.app/container/stub"
 	"hakurei.app/hst"
 	"hakurei.app/internal/acl"
+	"hakurei.app/internal/stub"
 	"hakurei.app/internal/system"
 )
 

internal/outcome/spruntime_test.go

@@ -5,10 +5,10 @@ import (
 
 	"hakurei.app/container"
 	"hakurei.app/container/std"
-	"hakurei.app/container/stub"
 	"hakurei.app/fhs"
 	"hakurei.app/hst"
 	"hakurei.app/internal/acl"
+	"hakurei.app/internal/stub"
 	"hakurei.app/internal/system"
 )
 

internal/outcome/sptmpdir_test.go

@@ -5,10 +5,10 @@ import (
 
 	"hakurei.app/container"
 	"hakurei.app/container/std"
-	"hakurei.app/container/stub"
 	"hakurei.app/fhs"
 	"hakurei.app/hst"
 	"hakurei.app/internal/acl"
+	"hakurei.app/internal/stub"
 	"hakurei.app/internal/system"
 )
 

internal/outcome/spwayland_test.go

@@ -4,9 +4,9 @@ import (
 	"testing"
 
 	"hakurei.app/container"
-	"hakurei.app/container/stub"
 	"hakurei.app/hst"
 	"hakurei.app/internal/acl"
+	"hakurei.app/internal/stub"
 	"hakurei.app/internal/system"
 	"hakurei.app/internal/wayland"
 )

internal/outcome/spx11_test.go

@@ -5,9 +5,9 @@ import (
 	"testing"
 
 	"hakurei.app/container"
-	"hakurei.app/container/stub"
 	"hakurei.app/hst"
 	"hakurei.app/internal/acl"
+	"hakurei.app/internal/stub"
 )
 
 func TestSpX11Op(t *testing.T) {

internal/pipewire/pipewire_test.go

@@ -8,8 +8,8 @@ import (
 	"testing"
 	"time"
 
-	"hakurei.app/container/stub"
 	"hakurei.app/internal/pipewire"
+	"hakurei.app/internal/stub"
 )
 
 func TestContext(t *testing.T) {

internal/pkg/exec_test.go

@@ -14,9 +14,9 @@ import (
 	"unique"
 
 	"hakurei.app/check"
-	"hakurei.app/container/stub"
 	"hakurei.app/hst"
 	"hakurei.app/internal/pkg"
+	"hakurei.app/internal/stub"
 )
 
 // testtoolBin is the container test tool binary made available to the

internal/pkg/pkg_test.go

@@ -23,9 +23,9 @@ import (
 
 	"hakurei.app/check"
 	"hakurei.app/container"
-	"hakurei.app/container/stub"
 	"hakurei.app/fhs"
 	"hakurei.app/internal/pkg"
+	"hakurei.app/internal/stub"
 	"hakurei.app/message"
 )
 

internal/pkg/tar_test.go

@@ -13,8 +13,8 @@ import (
 	"testing/fstest"
 
 	"hakurei.app/check"
-	"hakurei.app/container/stub"
 	"hakurei.app/internal/pkg"
+	"hakurei.app/internal/stub"
 )
 
 func TestTar(t *testing.T) {

internal/store/data_test.go

@@ -11,8 +11,8 @@ import (
 	"testing"
 	"time"
 
-	"hakurei.app/container/stub"
 	"hakurei.app/hst"
+	"hakurei.app/internal/stub"
 )
 
 func TestEntryData(t *testing.T) {

internal/store/segment_test.go

@@ -13,9 +13,9 @@ import (
 	_ "unsafe" // for go:linkname
 
 	"hakurei.app/check"
-	"hakurei.app/container/stub"
 	"hakurei.app/hst"
 	"hakurei.app/internal/store"
+	"hakurei.app/internal/stub"
 )
 
 // Made available here for direct validation of state entry files.

internal/stub/call_test.go

@@ -4,7 +4,7 @@ import (
 	"reflect"
 	"testing"
 
-	"hakurei.app/container/stub"
+	"hakurei.app/internal/stub"
 )
 
 func TestCallError(t *testing.T) {

internal/stub/errors.go

@@ -9,11 +9,14 @@ var (
 	ErrCheck = errors.New("one or more arguments did not match")
 )
 
-// UniqueError is an error that only equivalates to other [UniqueError] with the same magic value.
+// UniqueError is an error that only equivalates to another [UniqueError] with
+// the same magic value.
 type UniqueError uintptr
 
 func (e UniqueError) Error() string {
-	return "unique error " + strconv.FormatUint(uint64(e), 10) + " injected by the test suite"
+	return "unique error " +
+		strconv.FormatUint(uint64(e), 10) +
+		" injected by the test suite"
 }
 
 func (e UniqueError) Is(target error) bool {

internal/stub/errors_test.go

@@ -5,7 +5,7 @@ import (
 	"syscall"
 	"testing"
 
-	"hakurei.app/container/stub"
+	"hakurei.app/internal/stub"
 )
 
 func TestUniqueError(t *testing.T) {

internal/stub/exit_test.go

@@ -4,12 +4,12 @@ import (
 	"testing"
 	_ "unsafe" // for go:linkname
 
-	"hakurei.app/container/stub"
+	"hakurei.app/internal/stub"
 )
 
 // Made available here to check panic recovery behaviour.
 //
-//go:linkname handleExitNew hakurei.app/container/stub.handleExitNew
+//go:linkname handleExitNew hakurei.app/internal/stub.handleExitNew
 func handleExitNew(t testing.TB)
 
 // overrideTFailNow overrides the Fail and FailNow method.

internal/stub/stub.go

@@ -1,5 +1,5 @@
-// Package stub provides function call level stubbing and validation
+// Package stub provides function call level stubbing and validation for library
-// for library functions that are impossible to check otherwise.
+// functions that are impossible to check otherwise.
 package stub
 
 import (

internal/system/acl_test.go

@@ -5,9 +5,9 @@ import (
 	"syscall"
 	"testing"
 
-	"hakurei.app/container/stub"
 	"hakurei.app/hst"
 	"hakurei.app/internal/acl"
+	"hakurei.app/internal/stub"
 )
 
 func TestACLUpdateOp(t *testing.T) {

internal/system/dbus_test.go

@@ -9,10 +9,10 @@ import (
 	"syscall"
 	"testing"
 
-	"hakurei.app/container/stub"
 	"hakurei.app/hst"
 	"hakurei.app/internal/dbus"
 	"hakurei.app/internal/helper"
+	"hakurei.app/internal/stub"
 )
 
 func TestDBusProxyOp(t *testing.T) {

internal/system/dispatcher_test.go

@@ -10,11 +10,11 @@ import (
 	"unsafe"
 
 	"hakurei.app/check"
-	"hakurei.app/container/stub"
 	"hakurei.app/hst"
 	"hakurei.app/internal/acl"
 	"hakurei.app/internal/dbus"
 	"hakurei.app/internal/pipewire"
+	"hakurei.app/internal/stub"
 	"hakurei.app/internal/xcb"
 )
 

internal/system/link_test.go

@@ -3,8 +3,8 @@ package system
 import (
 	"testing"
 
-	"hakurei.app/container/stub"
 	"hakurei.app/hst"
+	"hakurei.app/internal/stub"
 )
 
 func TestHardlinkOp(t *testing.T) {

internal/system/mkdir_test.go

@@ -4,7 +4,7 @@ import (
 	"os"
 	"testing"
 
-	"hakurei.app/container/stub"
+	"hakurei.app/internal/stub"
 )
 
 func TestMkdirOp(t *testing.T) {

internal/system/pipewire_test.go

@@ -8,9 +8,9 @@ import (
 	"testing"
 	"time"
 
-	"hakurei.app/container/stub"
 	"hakurei.app/internal/acl"
 	"hakurei.app/internal/pipewire"
+	"hakurei.app/internal/stub"
 )
 
 func TestPipeWireOp(t *testing.T) {

internal/system/system_test.go

@@ -9,8 +9,8 @@ import (
 	"testing"
 
 	"hakurei.app/check"
-	"hakurei.app/container/stub"
 	"hakurei.app/hst"
+	"hakurei.app/internal/stub"
 	"hakurei.app/internal/xcb"
 	"hakurei.app/message"
 )

internal/system/wayland_test.go

@@ -4,8 +4,8 @@ import (
 	"os"
 	"testing"
 
-	"hakurei.app/container/stub"
 	"hakurei.app/internal/acl"
+	"hakurei.app/internal/stub"
 )
 
 func TestWaylandOp(t *testing.T) {

internal/system/xhost_test.go

@@ -3,8 +3,8 @@ package system
 import (
 	"testing"
 
-	"hakurei.app/container/stub"
 	"hakurei.app/hst"
+	"hakurei.app/internal/stub"
 	"hakurei.app/internal/xcb"
 )
 

internal/wayland/wayland_test.go

@@ -7,7 +7,7 @@ import (
 	"syscall"
 	"testing"
 
-	"hakurei.app/container/stub"
+	"hakurei.app/internal/stub"
 )
 
 func TestError(t *testing.T) {

message/message_test.go

@@ -10,7 +10,7 @@ import (
 	"testing"
 
 	"hakurei.app/container"
-	"hakurei.app/container/stub"
+	"hakurei.app/internal/stub"
 	"hakurei.app/message"
 )
 

message/output_test.go

@@ -8,7 +8,7 @@ import (
 	"syscall"
 	"testing"
 
-	"hakurei.app/container/stub"
+	"hakurei.app/internal/stub"
 	"hakurei.app/message"
 )