From d70fe49b28de0f9ab76aba7e3813690507f67852 Mon Sep 17 00:00:00 2001 From: stevenhorsman Date: Mon, 10 Oct 2022 15:23:11 +0100 Subject: [PATCH] runtime: Merge fixes Update tests to fix merge errors Signed-off-by: stevenhorsman --- src/runtime/virtcontainers/qemu_amd64_test.go | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/src/runtime/virtcontainers/qemu_amd64_test.go b/src/runtime/virtcontainers/qemu_amd64_test.go index 3592ddcbe2..4cd0989903 100644 --- a/src/runtime/virtcontainers/qemu_amd64_test.go +++ b/src/runtime/virtcontainers/qemu_amd64_test.go @@ -14,6 +14,7 @@ import ( "os" "testing" + "github.com/intel-go/cpuid" govmmQemu "github.com/kata-containers/kata-containers/src/runtime/pkg/govmm/qemu" "github.com/kata-containers/kata-containers/src/runtime/virtcontainers/types" "github.com/stretchr/testify/assert" @@ -279,7 +280,7 @@ func TestQemuAmd64AppendProtectionDevice(t *testing.T) { assert.NoError(err) assert.Empty(bios) - expectedOut = append(expectedOut, + expectedOut := []govmmQemu.Device{ govmmQemu.Object{ Type: govmmQemu.SNPGuest, ID: "snp", @@ -288,7 +289,7 @@ func TestQemuAmd64AppendProtectionDevice(t *testing.T) { CBitPos: cpuid.AMDMemEncrypt.CBitPosition, ReducedPhysBits: 1, }, - ) + } assert.Equal(expectedOut, devices) @@ -299,7 +300,7 @@ func TestQemuAmd64AppendProtectionDevice(t *testing.T) { assert.NoError(err) assert.Empty(bios) - expectedOut := []govmmQemu.Device{ + expectedOut = append(expectedOut, govmmQemu.Object{ Driver: govmmQemu.Loader, Type: govmmQemu.TDXGuest, @@ -308,7 +309,7 @@ func TestQemuAmd64AppendProtectionDevice(t *testing.T) { Debug: false, File: firmware, }, - } + ) assert.Equal(expectedOut, devices) }