github/containerd
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 2 Wiki Activity

container_test.go: fix compilation failure

Browse Source 
# github.com/containerd/containerd
  ./container_test.go:769: cannot use &limit (type *uint64) as type *int64 in field value
  ./container_test.go:812: cannot use &limit (type *uint64) as type *int64 in field value

Signed-off-by: Akihiro Suda <suda.akihiro@lab.ntt.co.jp>
This commit is contained in:
Akihiro Suda 2017-06-28 04:43:01 +00:00
parent a5fa3bb923
commit 3d981335e3
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
container_test.go
View File

@ -764,7 +764,7 @@ func TestContainerUpdate(t *testing.T) {
t.Error(err) t.Error(err)
return return
} }
limit := uint64(32 * 1024 * 1024) limit := int64(32 * 1024 * 1024)
spec.Linux.Resources.Memory = &specs.LinuxMemory{ spec.Linux.Resources.Memory = &specs.LinuxMemory{
Limit: &limit, Limit: &limit,
} }
@ -802,7 +802,7 @@ func TestContainerUpdate(t *testing.T) {
t.Error(err) t.Error(err)
return return
} }
if stat.Memory.Usage.Limit != limit { if int64(stat.Memory.Usage.Limit) != limit {
t.Errorf("expected memory limit to be set to %d but received %d", limit, stat.Memory.Usage.Limit) t.Errorf("expected memory limit to be set to %d but received %d", limit, stat.Memory.Usage.Limit)
return return
} }
@ -819,7 +819,7 @@ func TestContainerUpdate(t *testing.T) {
t.Error(err) t.Error(err)
return return
} }
if stat.Memory.Usage.Limit != limit { if int64(stat.Memory.Usage.Limit) != limit {
t.Errorf("expected memory limit to be set to %d but received %d", limit, stat.Memory.Usage.Limit) t.Errorf("expected memory limit to be set to %d but received %d", limit, stat.Memory.Usage.Limit)
} }
if err := task.Kill(ctx, syscall.SIGKILL); err != nil { if err := task.Kill(ctx, syscall.SIGKILL); err != nil {