@@ -295,38 +295,28 @@ func TestContainerInspectHostConfigDefaults(t *testing.T) {
295295
296296 inspect := base .InspectContainer (testContainer )
297297 t .Logf ("HostConfig in TestContainerInspectHostConfigDefaults: %+v" , inspect .HostConfig )
298- t .Logf ("inspect.HostConfig.CPUSetCPUs in TestContainerInspectHostConfigDefaults: %+v" , inspect .HostConfig .CPUSetCPUs )
299298 assert .Equal (t , "" , inspect .HostConfig .CPUSetCPUs )
300- t .Logf ("inspect.HostConfig.CPUSetMems in TestContainerInspectHostConfigDefaults: %+v" , inspect .HostConfig .CPUSetMems )
301299 assert .Equal (t , "" , inspect .HostConfig .CPUSetMems )
302- t .Logf ("inspect.HostConfig.BlkioWeight in TestContainerInspectHostConfigDefaults: %+v" , inspect .HostConfig .BlkioWeight )
303300 assert .Equal (t , uint16 (0 ), inspect .HostConfig .BlkioWeight )
304- t .Logf ("inspect.HostConfig.CPUShares in TestContainerInspectHostConfigDefaults: %+v" , inspect .HostConfig .CPUShares )
305301 assert .Equal (t , uint64 (0 ), inspect .HostConfig .CPUShares )
306- t .Logf ("inspect.HostConfig.CPUQuota in TestContainerInspectHostConfigDefaults: %+v" , inspect .HostConfig .CPUQuota )
307302 assert .Equal (t , int64 (0 ), inspect .HostConfig .CPUQuota )
308- t .Logf ("len(inspect.HostConfig.GroupAdd) in TestContainerInspectHostConfigDefaults: %+v" , len (inspect .HostConfig .GroupAdd ))
309303 assert .Equal (t , 0 , len (inspect .HostConfig .GroupAdd ))
310- t .Logf ("len(inspect.HostConfig.ExtraHosts) in TestContainerInspectHostConfigDefaults: %+v" , len (inspect .HostConfig .ExtraHosts ))
311304 assert .Equal (t , 0 , len (inspect .HostConfig .ExtraHosts ))
312- t .Logf ("inspect.HostConfig.IpcMode in TestContainerInspectHostConfigDefaults: %+v" , inspect .HostConfig .IpcMode )
313305 assert .Equal (t , "private" , inspect .HostConfig .IpcMode )
314- t .Logf ("inspect.HostConfig.LogConfig.Driver in TestContainerInspectHostConfigDefaults: %+v" , inspect .HostConfig .LogConfig .Driver )
315306 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 ))
307+ assert . Equal ( t , int64 ( 0 ), inspect . HostConfig . Memory )
308+ t . Logf ( "inspect.HostConfig.Memory in TestContainerInspectHostConfigDefaults: %+v" , inspect .HostConfig .Memory )
309+ assert . Equal ( t , int64 ( 0 ) , inspect .HostConfig .MemorySwap )
310+ t . Logf ( "inspect.HostConfig.MemorySwap in TestContainerInspectHostConfigDefaults: %+v" , inspect .HostConfig .MemorySwap )
311+ assert . Equal ( t , bool ( false ) , inspect .HostConfig .OomKillDisable )
312+ t . Logf ( "inspect.HostConfig.OomKillDisable in TestContainerInspectHostConfigDefaults: %+v" , inspect .HostConfig .OomKillDisable )
313+ assert . Equal ( t , bool ( false ) , inspect .HostConfig .ReadonlyRootfs )
314+ assert .Equal (t , "" , inspect .HostConfig .UTSMode )
315+ assert .Equal (t , int64 ( 67108864 ) , inspect .HostConfig .ShmSize )
316+ assert .Equal (t , "runc" , inspect .HostConfig .Runtime )
317+ assert .Equal (t , 0 , len ( inspect .HostConfig .Sysctls ) )
318+ assert .Equal (t , 0 , len (inspect .HostConfig .Devices ))
328319 // t.Logf("len(inspect.HostConfig.Sysctls) in TestContainerInspectHostConfigDefaults: %+v", len(inspect.HostConfig.Sysctls))
329- // assert.Equal(t, 0, len(inspect.HostConfig.Devices))
330320 // t.Logf("len(inspect.HostConfig.Devices) in TestContainerInspectHostConfigDefaults: %+v", len(inspect.HostConfig.Devices))
331321}
332322
0 commit comments