InTheForest/moby
1
0
Fork 0
mirror of https://github.com/moby/moby.git synced 2026-01-11 18:51:37 +00:00
Code Issues Packages Projects Releases Wiki Activity

NRI: minor cleanups

Browse Source 
Address some post-merge review comments.

Signed-off-by: Rob Murray <rob.murray@docker.com>
This commit is contained in:
Rob Murray
2025-12-10 15:10:38 +00:00
parent 07024223e2
commit dc1fe0be82
2 changed files with 17 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
integration/daemon/nri/nri_test.go
View File

@@ -16,13 +16,12 @@ import (
func TestNRIContainerCreateEnvVarMod(t *testing.T) {
skip.If(t, testEnv.IsRemoteDaemon, "cannot run daemon when remote daemon")
skip.If(t, testEnv.DaemonInfo.OSType == "windows")
skip.If(t, testEnv.DaemonInfo.OSType == "windows", "cannot start a separate daemon with NRI enabled on Windows")
skip.If(t, testEnv.IsRootless)
ctx := testutil.StartSpan(baseContext, t)
tmp := t.TempDir()
sockPath := filepath.Join(tmp, "nri.sock")
sockPath := filepath.Join(t.TempDir(), "nri.sock")
d := daemon.New(t)
d.StartWithBusybox(ctx, t,
@@ -32,7 +31,7 @@ func TestNRIContainerCreateEnvVarMod(t *testing.T) {
defer d.Stop(t)
c := d.NewClientT(t)
testcases := []struct {
tests := []struct {
name string
ctrCreateAdj *api.ContainerAdjustment
expEnv string
@@ -49,7 +48,7 @@ func TestNRIContainerCreateEnvVarMod(t *testing.T) {
},
}
for _, tc := range testcases {
for _, tc := range tests {
t.Run(tc.name, func(t *testing.T) {
stopPlugin := startBuiltinPlugin(ctx, t, builtinPluginConfig{
pluginName: "nri-test-plugin",