From 6242af34e4827b17ad0142f6e5a554582b17a8b7 Mon Sep 17 00:00:00 2001 From: Alice Frosi Date: Wed, 6 Mar 2019 14:10:41 +0100 Subject: [PATCH 1/2] s390x: fix TestQemuS390xMemoryTopology The memory parameters of the test are wrong Fixes: #1329 Signed-off-by: Alice Frosi --- virtcontainers/qemu_s390x_test.go | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/virtcontainers/qemu_s390x_test.go b/virtcontainers/qemu_s390x_test.go index 9bb740ca3..d64a58bd5 100644 --- a/virtcontainers/qemu_s390x_test.go +++ b/virtcontainers/qemu_s390x_test.go @@ -38,7 +38,6 @@ func TestQemuS390xCPUModel(t *testing.T) { func TestQemuS390xMemoryTopology(t *testing.T) { assert := assert.New(t) s390x := newTestQemu(QemuCCWVirtio) - memoryOffset := 1024 hostMem := uint64(1024) mem := uint64(120) @@ -46,7 +45,7 @@ func TestQemuS390xMemoryTopology(t *testing.T) { expectedMemory := govmmQemu.Memory{ Size: fmt.Sprintf("%dM", mem), Slots: slots, - MaxMem: fmt.Sprintf("%dM", hostMem+uint64(memoryOffset)), + MaxMem: fmt.Sprintf("%dM", hostMem), } m := s390x.memoryTopology(mem, hostMem, slots) From 8ba27e14a13d081d79f3d25c8e7ce6db086ec546 Mon Sep 17 00:00:00 2001 From: Alice Frosi Date: Wed, 6 Mar 2019 15:29:26 +0100 Subject: [PATCH 2/2] s390x: remove pmu from test Remove pmu option because it is not used and the test TestQemuS390xCPUModel fails because the option is present Fixes: #1329 Signed-off-by: Alice Frosi --- virtcontainers/qemu_s390x_test.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/virtcontainers/qemu_s390x_test.go b/virtcontainers/qemu_s390x_test.go index d64a58bd5..fb491ce14 100644 --- a/virtcontainers/qemu_s390x_test.go +++ b/virtcontainers/qemu_s390x_test.go @@ -30,7 +30,7 @@ func TestQemuS390xCPUModel(t *testing.T) { assert.Equal(expectedOut, model) s390x.enableNestingChecks() - expectedOut = defaultCPUModel + ",pmu=off" + expectedOut = defaultCPUModel model = s390x.cpuModel() assert.Equal(expectedOut, model) }