github/kata-containers
1
0
Fork 1
mirror of https://github.com/kata-containers/kata-containers.git synced 2025-08-15 06:34:03 +00:00
Code Issues Projects Releases Wiki Activity

linter: remove deadcode linter check for generic item

Browse Source 
After we switched golang linter to golangci-lint, we has extra 'deadcode'
linter check, and we need to remove this linter check for all
generic items.

Fixes: #1432

Signed-off-by: Penny Zheng <penny.zheng@arm.com>
This commit is contained in:
Penny Zheng 2019-03-28 12:41:03 +08:00
parent c89eb81dec
commit 2e5194e279
5 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
cli/kata-check.go
View File

@ -52,9 +52,9 @@ const (
kernelPropertyCorrect = "Kernel property value correct" kernelPropertyCorrect = "Kernel property value correct"
// these refer to fields in the procCPUINFO file // these refer to fields in the procCPUINFO file
genericCPUFlagsTag = "flags" // nolint: varcheck, unused genericCPUFlagsTag = "flags" // nolint: varcheck, unused, deadcode
genericCPUVendorField = "vendor_id" // nolint: varcheck, unused genericCPUVendorField = "vendor_id" // nolint: varcheck, unused, deadcode
genericCPUModelField = "model name" // nolint: varcheck, unused genericCPUModelField = "model name" // nolint: varcheck, unused, deadcode
) )
// variables rather than consts to allow tests to modify them // variables rather than consts to allow tests to modify them

6
cli/kata-check_test.go
View File

@ -27,14 +27,14 @@ type testModuleData struct {
contents string contents string
} }
// nolint: structcheck, unused // nolint: structcheck, unused, deadcode
type testCPUData struct { type testCPUData struct {
vendorID string vendorID string
flags string flags string
expectError bool expectError bool
} }
// nolint: structcheck, unused // nolint: structcheck, unused, deadcode
type testCPUDetail struct { type testCPUDetail struct {
contents string contents string
expectedVendor string expectedVendor string
@ -147,7 +147,7 @@ func makeCPUInfoFile(path, vendorID, flags string) error {
return ioutil.WriteFile(path, contents.Bytes(), testFileMode) return ioutil.WriteFile(path, contents.Bytes(), testFileMode)
} }
// nolint: unused // nolint: unused, deadcode
func genericTestGetCPUDetails(t *testing.T, validVendor string, validModel string, validContents string, data []testCPUDetail) { func genericTestGetCPUDetails(t *testing.T, validVendor string, validModel string, validContents string, data []testCPUDetail) {
tmpdir, err := ioutil.TempDir("", "") tmpdir, err := ioutil.TempDir("", "")
if err != nil { if err != nil {

2
cli/kata-env_test.go
View File

@ -244,7 +244,7 @@ func getExpectedAgentDetails(config oci.RuntimeConfig) (AgentInfo, error) {
}, nil }, nil
} }
// nolint: unused // nolint: unused, deadcode
func genericGetExpectedHostDetails(tmpdir string, expectedVendor string, expectedModel string, expectedVMContainerCapable bool) (HostInfo, error) { func genericGetExpectedHostDetails(tmpdir string, expectedVendor string, expectedModel string, expectedVMContainerCapable bool) (HostInfo, error) {
type filesToCreate struct { type filesToCreate struct {
file string file string

4
virtcontainers/hypervisor_test.go
View File

@ -437,14 +437,14 @@ func TestGetHostMemorySizeKb(t *testing.T) {
} }
} }
// nolint: unused // nolint: unused, deadcode
type testNestedVMMData struct { type testNestedVMMData struct {
content []byte content []byte
expectedErr bool expectedErr bool
expected bool expected bool
} }
// nolint: unused,deadcode // nolint: unused, deadcode
func genericTestRunningOnVMM(t *testing.T, data []testNestedVMMData) { func genericTestRunningOnVMM(t *testing.T, data []testNestedVMMData) {
for _, d := range data { for _, d := range data {
f, err := ioutil.TempFile("", "cpuinfo") f, err := ioutil.TempFile("", "cpuinfo")

6
virtcontainers/qemu.go
View File

@ -1425,7 +1425,7 @@ func (q *qemu) resizeMemory(reqMemMB uint32, memoryBlockSizeMB uint32) (uint32,
} }
// genericAppendBridges appends to devices the given bridges // genericAppendBridges appends to devices the given bridges
// nolint: unused // nolint: unused, deadcode
func genericAppendBridges(devices []govmmQemu.Device, bridges []types.PCIBridge, machineType string) []govmmQemu.Device { func genericAppendBridges(devices []govmmQemu.Device, bridges []types.PCIBridge, machineType string) []govmmQemu.Device {
bus := defaultPCBridgeBus bus := defaultPCBridgeBus
switch machineType { switch machineType {
@ -1457,7 +1457,7 @@ func genericAppendBridges(devices []govmmQemu.Device, bridges []types.PCIBridge,
return devices return devices
} }
// nolint: unused // nolint: unused, deadcode
func genericBridges(number uint32, machineType string) []types.PCIBridge { func genericBridges(number uint32, machineType string) []types.PCIBridge {
var bridges []types.PCIBridge var bridges []types.PCIBridge
var bt types.PCIType var bt types.PCIType
@ -1490,7 +1490,7 @@ func genericBridges(number uint32, machineType string) []types.PCIBridge {
return bridges return bridges
} }
// nolint: unused // nolint: unused, deadcode
func genericMemoryTopology(memoryMb, hostMemoryMb uint64, slots uint8, memoryOffset uint32) govmmQemu.Memory { func genericMemoryTopology(memoryMb, hostMemoryMb uint64, slots uint8, memoryOffset uint32) govmmQemu.Memory {
// image NVDIMM device needs memory space 1024MB // image NVDIMM device needs memory space 1024MB
// See https://github.com/clearcontainers/runtime/issues/380 // See https://github.com/clearcontainers/runtime/issues/380