@@ -253,14 +253,14 @@ func TestContainerInspectHostConfig(t *testing.T) {
253253 "--uts" , "host" ,
254254 "--device" , "/dev/null:/dev/null" ,
255255 "--sysctl" , "net.core.somaxconn=1024" ,
256+ "--runtime" , "io.containerd.runc.v2" ,
256257 testutil .AlpineImage , "sleep" , "infinity" ).AssertOK ()
257258
258259 inspect := base .InspectContainer (testContainer )
259260 t .Log ("==========" )
260261 t .Log (inspect .HostConfig )
261262 t .Log ("==========" )
262263 // "--runtime", "io.containerd.runtime.v1.linux",
263- // "--sysctl", "net.core.somaxconn=1024",
264264
265265 assert .Equal (t , "0-1" , inspect .HostConfig .CPUSetCPUs )
266266 assert .Equal (t , "0" , inspect .HostConfig .CPUSetMems )
@@ -284,51 +284,51 @@ func TestContainerInspectHostConfig(t *testing.T) {
284284 // assert.Equal(t, bool(true), inspect.HostConfig.OomKillDisable)
285285}
286286
287- // func TestContainerInspectHostConfigDefaults(t *testing.T) {
288- // testContainer := testutil.Identifier(t)
287+ func TestContainerInspectHostConfigDefaults (t * testing.T ) {
288+ testContainer := testutil .Identifier (t )
289289
290- // base := testutil.NewBase(t)
291- // defer base.Cmd("rm", "-f", testContainer).Run()
290+ base := testutil .NewBase (t )
291+ defer base .Cmd ("rm" , "-f" , testContainer ).Run ()
292292
293- // // Run a container without specifying HostConfig options
294- // base.Cmd("run", "-d", "--name", testContainer, testutil.AlpineImage, "sleep", "infinity").AssertOK()
293+ // Run a container without specifying HostConfig options
294+ base .Cmd ("run" , "-d" , "--name" , testContainer , testutil .AlpineImage , "sleep" , "infinity" ).AssertOK ()
295295
296- // inspect := base.InspectContainer(testContainer)
297- // t.Logf("HostConfig in TestContainerInspectHostConfigDefaults: %+v", inspect.HostConfig)
298- // t.Logf("inspect.HostConfig.CPUSetCPUs in TestContainerInspectHostConfigDefaults: %+v", inspect.HostConfig.CPUSetCPUs)
299- // assert.Equal(t, "", inspect.HostConfig.CPUSetCPUs)
300- // t.Logf("inspect.HostConfig.CPUSetMems in TestContainerInspectHostConfigDefaults: %+v", inspect.HostConfig.CPUSetMems)
301- // assert.Equal(t, "", inspect.HostConfig.CPUSetMems)
302- // t.Logf("inspect.HostConfig.BlkioWeight in TestContainerInspectHostConfigDefaults: %+v", inspect.HostConfig.BlkioWeight)
303- // assert.Equal(t, uint16(0), inspect.HostConfig.BlkioWeight)
304- // t.Logf("inspect.HostConfig.CPUShares in TestContainerInspectHostConfigDefaults: %+v", inspect.HostConfig.CPUShares)
305- // assert.Equal(t, uint64(0), inspect.HostConfig.CPUShares)
306- // t.Logf("inspect.HostConfig.CPUQuota in TestContainerInspectHostConfigDefaults: %+v", inspect.HostConfig.CPUQuota)
307- // assert.Equal(t, int64(0), inspect.HostConfig.CPUQuota)
308- // t.Logf("len(inspect.HostConfig.GroupAdd) in TestContainerInspectHostConfigDefaults: %+v", len(inspect.HostConfig.GroupAdd))
309- // assert.Equal(t, 0, len(inspect.HostConfig.GroupAdd))
310- // t.Logf("len(inspect.HostConfig.ExtraHosts) in TestContainerInspectHostConfigDefaults: %+v", len(inspect.HostConfig.ExtraHosts))
311- // assert.Equal(t, 0, len(inspect.HostConfig.ExtraHosts))
312- // t.Logf("inspect.HostConfig.IpcMode in TestContainerInspectHostConfigDefaults: %+v", inspect.HostConfig.IpcMode)
313- // assert.Equal(t, "private", inspect.HostConfig.IpcMode)
314- // t.Logf("inspect.HostConfig.LogConfig.Driver in TestContainerInspectHostConfigDefaults: %+v", inspect.HostConfig.LogConfig.Driver)
315- // assert.Equal(t, "", inspect.HostConfig.LogConfig.Driver)
316-
317- // assert.Equal(t, int64(0), inspect.HostConfig.Memory)
318- // t.Logf("inspect.HostConfig.Memory in TestContainerInspectHostConfigDefaults: %+v", inspect.HostConfig.Memory)
319- // assert.Equal(t, int64(0), inspect.HostConfig.MemorySwap)
320- // t.Logf("inspect.HostConfig.MemorySwap in TestContainerInspectHostConfigDefaults: %+v", inspect.HostConfig.MemorySwap)
321- // assert.Equal(t, bool(false), inspect.HostConfig.OomKillDisable)
322- // t.Logf("inspect.HostConfig.OomKillDisable in TestContainerInspectHostConfigDefaults: %+v", inspect.HostConfig.OomKillDisable)
323- // assert.Equal(t, bool(false), inspect.HostConfig.ReadonlyRootfs)
324- // assert.Equal(t, "", inspect.HostConfig.UTSMode)
325- // assert.Equal(t, int64(67108864), inspect.HostConfig.ShmSize)
326- // assert.Equal(t, "io.containerd.runc.v2", inspect.HostConfig.Runtime)
327- // assert.Equal(t, 0, len(inspect.HostConfig.Sysctls))
328- // t.Logf("len(inspect.HostConfig.Sysctls) in TestContainerInspectHostConfigDefaults: %+v", len(inspect.HostConfig.Sysctls))
329- // assert.Equal(t, 0, len(inspect.HostConfig.Devices))
330- // t.Logf("len(inspect.HostConfig.Devices) in TestContainerInspectHostConfigDefaults: %+v", len(inspect.HostConfig.Devices))
331- // }
296+ inspect := base .InspectContainer (testContainer )
297+ t .Logf ("HostConfig in TestContainerInspectHostConfigDefaults: %+v" , inspect .HostConfig )
298+ t .Logf ("inspect.HostConfig.CPUSetCPUs in TestContainerInspectHostConfigDefaults: %+v" , inspect .HostConfig .CPUSetCPUs )
299+ assert .Equal (t , "" , inspect .HostConfig .CPUSetCPUs )
300+ t .Logf ("inspect.HostConfig.CPUSetMems in TestContainerInspectHostConfigDefaults: %+v" , inspect .HostConfig .CPUSetMems )
301+ assert .Equal (t , "" , inspect .HostConfig .CPUSetMems )
302+ t .Logf ("inspect.HostConfig.BlkioWeight in TestContainerInspectHostConfigDefaults: %+v" , inspect .HostConfig .BlkioWeight )
303+ assert .Equal (t , uint16 (0 ), inspect .HostConfig .BlkioWeight )
304+ t .Logf ("inspect.HostConfig.CPUShares in TestContainerInspectHostConfigDefaults: %+v" , inspect .HostConfig .CPUShares )
305+ assert .Equal (t , uint64 (0 ), inspect .HostConfig .CPUShares )
306+ t .Logf ("inspect.HostConfig.CPUQuota in TestContainerInspectHostConfigDefaults: %+v" , inspect .HostConfig .CPUQuota )
307+ assert .Equal (t , int64 (0 ), inspect .HostConfig .CPUQuota )
308+ t .Logf ("len(inspect.HostConfig.GroupAdd) in TestContainerInspectHostConfigDefaults: %+v" , len (inspect .HostConfig .GroupAdd ))
309+ assert .Equal (t , 0 , len (inspect .HostConfig .GroupAdd ))
310+ t .Logf ("len(inspect.HostConfig.ExtraHosts) in TestContainerInspectHostConfigDefaults: %+v" , len (inspect .HostConfig .ExtraHosts ))
311+ assert .Equal (t , 0 , len (inspect .HostConfig .ExtraHosts ))
312+ t .Logf ("inspect.HostConfig.IpcMode in TestContainerInspectHostConfigDefaults: %+v" , inspect .HostConfig .IpcMode )
313+ assert .Equal (t , "private" , inspect .HostConfig .IpcMode )
314+ t .Logf ("inspect.HostConfig.LogConfig.Driver in TestContainerInspectHostConfigDefaults: %+v" , inspect .HostConfig .LogConfig .Driver )
315+ assert .Equal (t , "" , inspect .HostConfig .LogConfig .Driver )
316+
317+ // assert.Equal(t, int64(0), inspect.HostConfig.Memory)
318+ // t.Logf("inspect.HostConfig.Memory in TestContainerInspectHostConfigDefaults: %+v", inspect.HostConfig.Memory)
319+ // assert.Equal(t, int64(0), inspect.HostConfig.MemorySwap)
320+ // t.Logf("inspect.HostConfig.MemorySwap in TestContainerInspectHostConfigDefaults: %+v", inspect.HostConfig.MemorySwap)
321+ // assert.Equal(t, bool(false), inspect.HostConfig.OomKillDisable)
322+ // t.Logf("inspect.HostConfig.OomKillDisable in TestContainerInspectHostConfigDefaults: %+v", inspect.HostConfig.OomKillDisable)
323+ // assert.Equal(t, bool(false), inspect.HostConfig.ReadonlyRootfs)
324+ // assert.Equal(t, "", inspect.HostConfig.UTSMode)
325+ // assert.Equal(t, int64(67108864), inspect.HostConfig.ShmSize)
326+ // assert.Equal(t, "io.containerd.runc.v2", inspect.HostConfig.Runtime)
327+ // assert.Equal(t, 0, len(inspect.HostConfig.Sysctls))
328+ // t.Logf("len(inspect.HostConfig.Sysctls) in TestContainerInspectHostConfigDefaults: %+v", len(inspect.HostConfig.Sysctls))
329+ // assert.Equal(t, 0, len(inspect.HostConfig.Devices))
330+ // t.Logf("len(inspect.HostConfig.Devices) in TestContainerInspectHostConfigDefaults: %+v", len(inspect.HostConfig.Devices))
331+ }
332332
333333func TestContainerInspectHostConfigDNS (t * testing.T ) {
334334 testContainer := testutil .Identifier (t )
0 commit comments