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

virtcontainers: remove temp dir created for vsock in test code

Browse Source 
remove temp dir generated by mock.GenerateKataMockHybridVSock().

Fixes: #3186

Signed-off-by: zhanghj <zhanghj.lc@inspur.com>
This commit is contained in:
zhanghj 2022-02-19 16:36:31 +08:00
parent a671b455a2
commit 94b831ebf8
5 changed files with 28 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/runtime/virtcontainers/api_test.go
View File

@ -170,10 +170,10 @@ func TestCreateSandboxKataAgentSuccessful(t *testing.T) {
url, err := mock.GenerateKataMockHybridVSock()
assert.NoError(err)
MockHybridVSockPath = url
defer mock.RemoveKataMockHybridVSock(url)
hybridVSockTTRPCMock := mock.HybridVSockTTRPCMock{}
err = hybridVSockTTRPCMock.Start(fmt.Sprintf("mock://%s", url))
err = hybridVSockTTRPCMock.Start(url)
assert.NoError(err)
defer hybridVSockTTRPCMock.Stop()

7
src/runtime/virtcontainers/factory/factory_test.go
View File

@ -7,7 +7,6 @@ package factory
import (
"context"
"fmt"
"os"
"testing"
@ -61,10 +60,11 @@ func TestNewFactory(t *testing.T) {
url, err := mock.GenerateKataMockHybridVSock()
assert.NoError(err)
defer mock.RemoveKataMockHybridVSock(url)
vc.MockHybridVSockPath = url
hybridVSockTTRPCMock := mock.HybridVSockTTRPCMock{}
err = hybridVSockTTRPCMock.Start(fmt.Sprintf("mock://%s", url))
err = hybridVSockTTRPCMock.Start(url)
assert.NoError(err)
defer hybridVSockTTRPCMock.Stop()
@ -179,10 +179,11 @@ func TestFactoryGetVM(t *testing.T) {
url, err := mock.GenerateKataMockHybridVSock()
assert.NoError(err)
defer mock.RemoveKataMockHybridVSock(url)
vc.MockHybridVSockPath = url
hybridVSockTTRPCMock := mock.HybridVSockTTRPCMock{}
err = hybridVSockTTRPCMock.Start(fmt.Sprintf("mock://%s", url))
err = hybridVSockTTRPCMock.Start(url)
assert.NoError(err)
defer hybridVSockTTRPCMock.Stop()

3
src/runtime/virtcontainers/factory/template/template_test.go
View File

@ -51,10 +51,11 @@ func TestTemplateFactory(t *testing.T) {
url, err := mock.GenerateKataMockHybridVSock()
assert.NoError(err)
defer mock.RemoveKataMockHybridVSock(url)
vc.MockHybridVSockPath = url
hybridVSockTTRPCMock := mock.HybridVSockTTRPCMock{}
err = hybridVSockTTRPCMock.Start(fmt.Sprintf("mock://%s", url))
err = hybridVSockTTRPCMock.Start(url)
assert.NoError(err)
defer hybridVSockTTRPCMock.Stop()

6
src/runtime/virtcontainers/kata_agent_test.go
View File

@ -50,6 +50,7 @@ func TestKataAgentConnect(t *testing.T) {
url, err := mock.GenerateKataMockHybridVSock()
assert.NoError(err)
defer mock.RemoveKataMockHybridVSock(url)
hybridVSockTTRPCMock := mock.HybridVSockTTRPCMock{}
err = hybridVSockTTRPCMock.Start(url)
@ -73,6 +74,7 @@ func TestKataAgentDisconnect(t *testing.T) {
url, err := mock.GenerateKataMockHybridVSock()
assert.NoError(err)
defer mock.RemoveKataMockHybridVSock(url)
hybridVSockTTRPCMock := mock.HybridVSockTTRPCMock{}
err = hybridVSockTTRPCMock.Start(url)
@ -110,6 +112,7 @@ func TestKataAgentSendReq(t *testing.T) {
url, err := mock.GenerateKataMockHybridVSock()
assert.NoError(err)
defer mock.RemoveKataMockHybridVSock(url)
hybridVSockTTRPCMock := mock.HybridVSockTTRPCMock{}
err = hybridVSockTTRPCMock.Start(url)
@ -843,6 +846,7 @@ func TestAgentCreateContainer(t *testing.T) {
url, err := mock.GenerateKataMockHybridVSock()
assert.NoError(err)
defer mock.RemoveKataMockHybridVSock(url)
hybridVSockTTRPCMock := mock.HybridVSockTTRPCMock{}
err = hybridVSockTTRPCMock.Start(url)
@ -873,6 +877,7 @@ func TestAgentNetworkOperation(t *testing.T) {
url, err := mock.GenerateKataMockHybridVSock()
assert.NoError(err)
defer mock.RemoveKataMockHybridVSock(url)
hybridVSockTTRPCMock := mock.HybridVSockTTRPCMock{}
err = hybridVSockTTRPCMock.Start(url)
@ -921,6 +926,7 @@ func TestKataCopyFile(t *testing.T) {
url, err := mock.GenerateKataMockHybridVSock()
assert.NoError(err)
defer mock.RemoveKataMockHybridVSock(url)
hybridVSockTTRPCMock := mock.HybridVSockTTRPCMock{}
err = hybridVSockTTRPCMock.Start(url)

15
src/runtime/virtcontainers/pkg/mock/mock.go
View File

@ -16,9 +16,13 @@ import (
gpb "github.com/gogo/protobuf/types"
aTypes "github.com/kata-containers/kata-containers/src/runtime/virtcontainers/pkg/agent/protocols"
pb "github.com/kata-containers/kata-containers/src/runtime/virtcontainers/pkg/agent/protocols/grpc"
"path"
"strings"
)
var testKataMockHybridVSockURLTempl = "mock://%s/kata-mock-hybrid-vsock.sock"
const VSockPrefix = "mock://"
var testKataMockHybridVSockURLTempl = VSockPrefix + "%s/kata-mock-hybrid-vsock.sock"
func GenerateKataMockHybridVSock() (string, error) {
dir, err := os.MkdirTemp("", "kata-mock-hybrid-vsock-test")
@ -29,6 +33,15 @@ func GenerateKataMockHybridVSock() (string, error) {
return fmt.Sprintf(testKataMockHybridVSockURLTempl, dir), nil
}
func RemoveKataMockHybridVSock(sockAddress string) error {
if !strings.HasPrefix(sockAddress, VSockPrefix) {
return fmt.Errorf("Invalid socket address: %s", sockAddress)
}
sockPath := strings.TrimPrefix(sockAddress, VSockPrefix)
return os.RemoveAll(path.Dir(sockPath))
}
// HybridVSockTTRPCMock is the ttrpc-based mock hybrid-vsock backend implementation
type HybridVSockTTRPCMock struct {
// HybridVSockTTRPCMockImp is the structure implementing