github/kata-containers
1
0
Fork 2
mirror of https://github.com/kata-containers/kata-containers.git synced 2025-10-23 13:13:21 +00:00
Code Issues Projects Releases Wiki Activity

runtime: fix vm factory UT failure

Browse Source 
We need to use different mocked socket otherwise they conflict with each
other.

Signed-off-by: Peng Tao <bergwolf@hyper.sh>
This commit is contained in:
Peng Tao
2021-03-24 18:20:12 +08:00
parent 076bc5075f
commit a2dee1f6a0
3 changed files with 20 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

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

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

@@ -59,8 +59,12 @@ func TestNewFactory(t *testing.T) {
t.Skip(testDisabledAsNonRoot) t.Skip(testDisabledAsNonRoot)
} }
url, err := mock.GenerateKataMockHybridVSock()
assert.NoError(err)
vc.MockHybridVSockPath = url
hybridVSockTTRPCMock := mock.HybridVSockTTRPCMock{} hybridVSockTTRPCMock := mock.HybridVSockTTRPCMock{}
err = hybridVSockTTRPCMock.Start(fmt.Sprintf("mock://%s", vc.MockHybridVSockPath)) err = hybridVSockTTRPCMock.Start(fmt.Sprintf("mock://%s", url))
assert.NoError(err) assert.NoError(err)
defer hybridVSockTTRPCMock.Stop() defer hybridVSockTTRPCMock.Stop()
@@ -173,8 +177,12 @@ func TestFactoryGetVM(t *testing.T) {
t.Skip(testDisabledAsNonRoot) t.Skip(testDisabledAsNonRoot)
} }
url, err := mock.GenerateKataMockHybridVSock()
assert.NoError(err)
vc.MockHybridVSockPath = url
hybridVSockTTRPCMock := mock.HybridVSockTTRPCMock{} hybridVSockTTRPCMock := mock.HybridVSockTTRPCMock{}
err = hybridVSockTTRPCMock.Start(fmt.Sprintf("mock://%s", vc.MockHybridVSockPath)) err = hybridVSockTTRPCMock.Start(fmt.Sprintf("mock://%s", url))
assert.NoError(err) assert.NoError(err)
defer hybridVSockTTRPCMock.Stop() defer hybridVSockTTRPCMock.Stop()

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

@@ -47,8 +47,12 @@ func TestTemplateFactory(t *testing.T) {
ctx := context.Background() ctx := context.Background()
url, err := mock.GenerateKataMockHybridVSock()
assert.NoError(err)
vc.MockHybridVSockPath = url
hybridVSockTTRPCMock := mock.HybridVSockTTRPCMock{} hybridVSockTTRPCMock := mock.HybridVSockTTRPCMock{}
err = hybridVSockTTRPCMock.Start(fmt.Sprintf("mock://%s", vc.MockHybridVSockPath)) err = hybridVSockTTRPCMock.Start(fmt.Sprintf("mock://%s", url))
assert.NoError(err) assert.NoError(err)
defer hybridVSockTTRPCMock.Stop() defer hybridVSockTTRPCMock.Stop()