github/kata-containers
1
0
Fork 1
mirror of https://github.com/kata-containers/kata-containers.git synced 2025-08-28 12:31:04 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #1313 from jcvenegas/fix-unit-test

Browse Source 
unit test: Fix local test
This commit is contained in:
Graham Whaley 2019-03-06 10:18:51 +00:00 committed by GitHub
commit ec6a1cc823
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 24 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
virtcontainers/Makefile
View File

@ -1,3 +1,9 @@
#
# Copyright (c) 2019 Intel Corporation
#
# SPDX-License-Identifier: Apache-2.0
#
PREFIX := /usr PREFIX := /usr
BIN_DIR := $(PREFIX)/bin BIN_DIR := $(PREFIX)/bin
VC_BIN_DIR := $(BIN_DIR)/virtcontainers/bin VC_BIN_DIR := $(BIN_DIR)/virtcontainers/bin
@ -10,6 +16,7 @@ CC_SHIM_DIR := shim/mock/cc-shim
CC_SHIM_BIN := cc-shim CC_SHIM_BIN := cc-shim
KATA_SHIM_DIR := shim/mock/kata-shim KATA_SHIM_DIR := shim/mock/kata-shim
KATA_SHIM_BIN := kata-shim KATA_SHIM_BIN := kata-shim
MK_DIR := $(shell dirname $(realpath $(lastword $(MAKEFILE_LIST))))
# #
# Pretty printing # Pretty printing
@ -49,10 +56,10 @@ binaries: virtc hook cc-shim kata-shim
check: check-go-static check-go-test check: check-go-static check-go-test
check-go-static: check-go-static:
bash .ci/go-lint.sh bash $(MK_DIR)/../.ci/go-lint.sh
check-go-test: check-go-test:
bash .ci/go-test.sh \ bash $(MK_DIR)/../.ci/go-test.sh \
$(TEST_BIN_DIR)/$(CC_SHIM_BIN) \ $(TEST_BIN_DIR)/$(CC_SHIM_BIN) \
$(TEST_BIN_DIR)/$(KATA_SHIM_BIN) \ $(TEST_BIN_DIR)/$(KATA_SHIM_BIN) \
$(TEST_BIN_DIR)/$(HOOK_BIN) $(TEST_BIN_DIR)/$(HOOK_BIN)

10
virtcontainers/api_test.go
View File

@ -86,6 +86,8 @@ func newTestSandboxConfigNoop() SandboxConfig {
Containers: []ContainerConfig{container}, Containers: []ContainerConfig{container},
Annotations: sandboxAnnotations, Annotations: sandboxAnnotations,
ProxyType: NoopProxyType,
} }
return sandboxConfig return sandboxConfig
@ -122,6 +124,8 @@ func newTestSandboxConfigHyperstartAgent() SandboxConfig {
Containers: []ContainerConfig{container}, Containers: []ContainerConfig{container},
Annotations: sandboxAnnotations, Annotations: sandboxAnnotations,
ProxyType: NoopProxyType,
} }
return sandboxConfig return sandboxConfig
@ -163,6 +167,8 @@ func newTestSandboxConfigHyperstartAgentDefaultNetwork() SandboxConfig {
Containers: []ContainerConfig{container}, Containers: []ContainerConfig{container},
Annotations: sandboxAnnotations, Annotations: sandboxAnnotations,
ProxyType: NoopProxyType,
} }
return sandboxConfig return sandboxConfig
@ -184,6 +190,8 @@ func newTestSandboxConfigKataAgent() SandboxConfig {
AgentType: KataContainersAgent, AgentType: KataContainersAgent,
Annotations: sandboxAnnotations, Annotations: sandboxAnnotations,
ProxyType: NoopProxyType,
} }
return sandboxConfig return sandboxConfig
@ -2014,6 +2022,8 @@ func createNewSandboxConfig(hType HypervisorType, aType AgentType, aConfig inter
AgentConfig: aConfig, AgentConfig: aConfig,
NetworkConfig: netConfig, NetworkConfig: netConfig,
ProxyType: NoopProxyType,
} }
} }

4
virtcontainers/proxy.go
View File

@ -109,6 +109,8 @@ func (pType *ProxyType) String() string {
// newProxy returns a proxy from a proxy type. // newProxy returns a proxy from a proxy type.
func newProxy(pType ProxyType) (proxy, error) { func newProxy(pType ProxyType) (proxy, error) {
switch pType { switch pType {
case "":
return &kataBuiltInProxy{}, nil
case NoopProxyType: case NoopProxyType:
return &noopProxy{}, nil return &noopProxy{}, nil
case NoProxyType: case NoProxyType:
@ -120,7 +122,7 @@ func newProxy(pType ProxyType) (proxy, error) {
case KataBuiltInProxyType: case KataBuiltInProxyType:
return &kataBuiltInProxy{}, nil return &kataBuiltInProxy{}, nil
default: default:
return &noopProxy{}, nil return &noopProxy{}, fmt.Errorf("Invalid proxy type: %s", pType)
} }
} }

7
virtcontainers/vm.go
View File

@ -62,12 +62,7 @@ func setupProxy(h hypervisor, agent agent, config VMConfig, id string) (int, str
return -1, "", nil, err return -1, "", nil, err
} }
// default to kata builtin proxy proxy, err := newProxy(config.ProxyType)
proxyType := config.ProxyType
if len(proxyType.String()) == 0 {
proxyType = KataBuiltInProxyType
}
proxy, err := newProxy(proxyType)
if err != nil { if err != nil {
return -1, "", nil, err return -1, "", nil, err
} }

2
virtcontainers/vm_test.go
View File

@ -102,7 +102,7 @@ func TestSetupProxy(t *testing.T) {
agent := &noopAgent{} agent := &noopAgent{}
// wrong proxy type // wrong proxy type
config.ProxyType = "invalidProxyType" config.ProxyType = ProxyType("invalidProxyType")
_, _, _, err := setupProxy(hypervisor, agent, config, "foobar") _, _, _, err := setupProxy(hypervisor, agent, config, "foobar")
assert.NotNil(err) assert.NotNil(err)