jasder
/
runc
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge pull request #316 from LK4D4/fix_vet 

Fix vet errors
This commit is contained in:
Mrunal Patel 2015-01-02 11:39:38 -08:00
parent 0f397d4e14 c34b3d5ce9
commit 14af6755f0
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
cgroups/fs/stats_util_test.go
View File

@ -53,7 +53,7 @@ func expectBlkioStatsEquals(t *testing.T, expected, actual cgroups.BlkioStats) {
} }
if err := blkioStatEntryEquals(expected.IoMergedRecursive, actual.IoMergedRecursive); err != nil { if err := blkioStatEntryEquals(expected.IoMergedRecursive, actual.IoMergedRecursive); err != nil {
log.Printf("blkio IoMergedRecursive do not match - %s vs %s\n", expected.IoMergedRecursive, actual.IoMergedRecursive) log.Printf("blkio IoMergedRecursive do not match - %v vs %v\n", expected.IoMergedRecursive, actual.IoMergedRecursive)
t.Fail() t.Fail()
} }

4
integration/template_test.go
View File

@ -32,13 +32,13 @@ func newTemplateConfig(rootfs string) *libcontainer.Config {
"KILL", "KILL",
"AUDIT_WRITE", "AUDIT_WRITE",
}, },
Namespaces: libcontainer.Namespaces{ Namespaces: libcontainer.Namespaces([]libcontainer.Namespace{
{Type: libcontainer.NEWNS}, {Type: libcontainer.NEWNS},
{Type: libcontainer.NEWUTS}, {Type: libcontainer.NEWUTS},
{Type: libcontainer.NEWIPC}, {Type: libcontainer.NEWIPC},
{Type: libcontainer.NEWPID}, {Type: libcontainer.NEWPID},
{Type: libcontainer.NEWNET}, {Type: libcontainer.NEWNET},
}, }),
Cgroups: &cgroups.Cgroup{ Cgroups: &cgroups.Cgroup{
Parent: "integration", Parent: "integration",
AllowAllDevices: false, AllowAllDevices: false,