mirror/runc
1
0
Fork 0
mirror of https://github.com/opencontainers/runc.git synced 2026-07-11 06:03:57 +08:00
Code Issues Packages Projects Releases Wiki Activity

libct/int: use testing.TB for utils

Browse Source 
...so that they can be used for benchmarks, too.

Signed-off-by: Kir Kolyshkin <kolyshkin@gmail.com>
This commit is contained in:
Kir Kolyshkin
2024-10-08 16:51:24 -07:00
parent e37371ebd7
commit cb20148703
2 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
libcontainer/integration/template_test.go
+1 -1
View File
@@ -32,7 +32,7 @@ type tParam struct {
// and the default setup for devices. // and the default setup for devices.
// //
// If p is nil, a default container is created. // If p is nil, a default container is created.
func newTemplateConfig(t *testing.T, p *tParam) *configs.Config { func newTemplateConfig(t testing.TB, p *tParam) *configs.Config {
var allowedDevices []*devices.Rule var allowedDevices []*devices.Rule
for _, device := range specconv.AllowedDevices { for _, device := range specconv.AllowedDevices {
allowedDevices = append(allowedDevices, &device.Rule) allowedDevices = append(allowedDevices, &device.Rule)
libcontainer/integration/utils_test.go
+5 -5
View File
@@ -85,7 +85,7 @@ func ok(t testing.TB, err error) {
} }
} }
func waitProcess(p *libcontainer.Process, t *testing.T) { func waitProcess(p *libcontainer.Process, t testing.TB) {
t.Helper() t.Helper()
status, err := p.Wait() status, err := p.Wait()
if err != nil { if err != nil {
@@ -99,7 +99,7 @@ func waitProcess(p *libcontainer.Process, t *testing.T) {
// newRootfs creates a new tmp directory and copies the busybox root // newRootfs creates a new tmp directory and copies the busybox root
// filesystem to it. // filesystem to it.
func newRootfs(t *testing.T) string { func newRootfs(t testing.TB) string {
t.Helper() t.Helper()
dir := t.TempDir() dir := t.TempDir()
if err := copyBusybox(dir); err != nil { if err := copyBusybox(dir); err != nil {
@@ -165,7 +165,7 @@ func copyBusybox(dest string) error {
return nil return nil
} }
func newContainer(t *testing.T, config *configs.Config) (*libcontainer.Container, error) { func newContainer(t testing.TB, config *configs.Config) (*libcontainer.Container, error) {
name := strings.ReplaceAll(t.Name(), "/", "_") + strconv.FormatInt(-int64(time.Now().Nanosecond()), 35) name := strings.ReplaceAll(t.Name(), "/", "_") + strconv.FormatInt(-int64(time.Now().Nanosecond()), 35)
root := t.TempDir() root := t.TempDir()
@@ -176,7 +176,7 @@ func newContainer(t *testing.T, config *configs.Config) (*libcontainer.Container
// //
// buffers are returned containing the STDOUT and STDERR output for the run // buffers are returned containing the STDOUT and STDERR output for the run
// along with the exit code and any go error // along with the exit code and any go error
func runContainer(t *testing.T, config *configs.Config, args ...string) (buffers *stdBuffers, exitCode int, err error) { func runContainer(t testing.TB, config *configs.Config, args ...string) (buffers *stdBuffers, exitCode int, err error) {
container, err := newContainer(t, config) container, err := newContainer(t, config)
if err != nil { if err != nil {
return nil, -1, err return nil, -1, err
@@ -214,7 +214,7 @@ func runContainer(t *testing.T, config *configs.Config, args ...string) (buffers
// runContainerOk is a wrapper for runContainer, simplifying its use for cases // runContainerOk is a wrapper for runContainer, simplifying its use for cases
// when the run is expected to succeed and return exit code of 0. // when the run is expected to succeed and return exit code of 0.
func runContainerOk(t *testing.T, config *configs.Config, args ...string) *stdBuffers { func runContainerOk(t testing.TB, config *configs.Config, args ...string) *stdBuffers {
buffers, exitCode, err := runContainer(t, config, args...) buffers, exitCode, err := runContainer(t, config, args...)
t.Helper() t.Helper()