From 13e65f2ee8d03f7918b1138d41c70b3eafb1f770 Mon Sep 17 00:00:00 2001 From: Amulya Meka Date: Mon, 27 Sep 2021 07:17:07 +0000 Subject: [PATCH] cmd: Fix mismatched types in testModuleData Rectify the values of testModuleData with the correct types in TestCCCheckCLiFunction in kata-check_(!x86)_test.go Fixes: #2735 Signed-off-by: Amulya Meka --- src/runtime/cmd/kata-runtime/kata-check_arm64_test.go | 6 +++--- src/runtime/cmd/kata-runtime/kata-check_ppc64le_test.go | 4 ++-- src/runtime/cmd/kata-runtime/kata-check_s390x_test.go | 2 +- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/runtime/cmd/kata-runtime/kata-check_arm64_test.go b/src/runtime/cmd/kata-runtime/kata-check_arm64_test.go index 681c251289..7ce1c9e3de 100644 --- a/src/runtime/cmd/kata-runtime/kata-check_arm64_test.go +++ b/src/runtime/cmd/kata-runtime/kata-check_arm64_test.go @@ -28,9 +28,9 @@ func setupCheckHostIsVMContainerCapable(assert *assert.Assertions, cpuInfoFile s func TestCCCheckCLIFunction(t *testing.T) { var cpuData []testCPUData moduleData := []testModuleData{ - {filepath.Join(sysModuleDir, "kvm"), true, ""}, - {filepath.Join(sysModuleDir, "vhost"), true, ""}, - {filepath.Join(sysModuleDir, "vhost_net"), true, ""}, + {filepath.Join(sysModuleDir, "kvm"), "", true}, + {filepath.Join(sysModuleDir, "vhost"), "", true}, + {filepath.Join(sysModuleDir, "vhost_net"), "", true}, } genericCheckCLIFunction(t, cpuData, moduleData) diff --git a/src/runtime/cmd/kata-runtime/kata-check_ppc64le_test.go b/src/runtime/cmd/kata-runtime/kata-check_ppc64le_test.go index 3553a3f841..97bfa99ead 100644 --- a/src/runtime/cmd/kata-runtime/kata-check_ppc64le_test.go +++ b/src/runtime/cmd/kata-runtime/kata-check_ppc64le_test.go @@ -47,8 +47,8 @@ func TestCCCheckCLIFunction(t *testing.T) { } moduleData := []testModuleData{ - {filepath.Join(sysModuleDir, "kvm"), false, "Y"}, - {filepath.Join(sysModuleDir, "kvm_hv"), false, "Y"}, + {filepath.Join(sysModuleDir, "kvm"), "", true}, + {filepath.Join(sysModuleDir, "kvm_hv"), "", true}, } genericCheckCLIFunction(t, cpuData, moduleData) diff --git a/src/runtime/cmd/kata-runtime/kata-check_s390x_test.go b/src/runtime/cmd/kata-runtime/kata-check_s390x_test.go index 1bcffd7e69..f13be4eaf6 100644 --- a/src/runtime/cmd/kata-runtime/kata-check_s390x_test.go +++ b/src/runtime/cmd/kata-runtime/kata-check_s390x_test.go @@ -47,7 +47,7 @@ func TestCCCheckCLIFunction(t *testing.T) { } moduleData := []testModuleData{ - {filepath.Join(sysModuleDir, "kvm"), false, "Y"}, + {filepath.Join(sysModuleDir, "kvm"), "", true}, } genericCheckCLIFunction(t, cpuData, moduleData)