aljaz/kata-containers
1
0
Fork 0
mirror of https://github.com/aljazceru/kata-containers.git synced 2025-12-26 10:34:24 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1330 from alicefr/s390_fix_test

Browse Source 
s390x: 2 small test fixes
This commit is contained in:
Julio Montes
2019-03-13 08:59:50 -06:00
committed by GitHub
parent ffbae64a2d 8ba27e14a1
commit 32220a5beb
1 changed files with 2 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
virtcontainers/qemu_s390x_test.go
View File

@@ -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)
}
@@ -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)