github/kata-containers
1
0
Fork 1
mirror of https://github.com/kata-containers/kata-containers.git synced 2025-07-03 10:37:10 +00:00
Code Issues Projects Releases Wiki Activity

unit-test: refine func TestGetCPUDetails

Browse Source 
refine struct testData in func TestGetCPUDetails to remove redundant
/unused struct field expectedVendor and expectedModel

Fixes: #1200

Signed-off-by: Penny Zheng <penny.zheng@arm.com>
This commit is contained in:
Penny Zheng 2019-02-14 11:09:54 +08:00
parent 1b967a4a6a
commit 23c554ee96
1 changed files with 10 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
cli/kata-check_arm64_test.go
View File

@ -129,19 +129,17 @@ func TestKvmIsUsable(t *testing.T) {
func TestGetCPUDetails(t *testing.T) { func TestGetCPUDetails(t *testing.T) {
type testData struct { type testData struct {
contents string contents string
expectedVendor string
expectedModel string
expectedNormalizeVendor string expectedNormalizeVendor string
expectedNormalizeModel string expectedNormalizeModel string
expectError bool expectError bool
} }
const validVendorName = "0x41" validVendorName := "0x41"
const validNormalizeVendorName = "ARM Limited" validNormalizeVendorName := "ARM Limited"
validVendor := fmt.Sprintf(`%s : %s`, archCPUVendorField, validVendorName) validVendor := fmt.Sprintf(`%s : %s`, archCPUVendorField, validVendorName)
const validModelName = "8" validModelName := "8"
const validNormalizeModelName = "v8" validNormalizeModelName := "v8"
validModel := fmt.Sprintf(`%s : %s`, archCPUModelField, validModelName) validModel := fmt.Sprintf(`%s : %s`, archCPUModelField, validModelName)
validContents := fmt.Sprintf(` validContents := fmt.Sprintf(`
@ -152,12 +150,12 @@ foo : bar
`, validVendor, validModel) `, validVendor, validModel)
data := []testData{ data := []testData{
{"", "", "", "", "", true}, {"", "", "", true},
{"invalid", "", "", "", "", true}, {"invalid", "", "", true},
{archCPUVendorField, "", "", "", "", true}, {archCPUVendorField, "", "", true},
{validVendor, "", "", "", "", true}, {validVendor, "", "", true},
{validModel, "", "", "", "", true}, {validModel, "", "", true},
{validContents, validVendorName, validModelName, validNormalizeVendorName, validNormalizeModelName, false}, {validContents, validNormalizeVendorName, validNormalizeModelName, false},
} }
tmpdir, err := ioutil.TempDir("", "") tmpdir, err := ioutil.TempDir("", "")