From e8ba10c0085d404378ce649e018624b93cf4aa65 Mon Sep 17 00:00:00 2001 From: Fabricio Voznika Date: Thu, 24 Oct 2019 16:35:29 -0700 Subject: Fix early deletion of rootDir container.startContainers() cannot be called twice in a test (e.g. TestMultiContainerLoadSandbox) because the cleanup function deletes the rootDir, together with information from all other containers that may exist. PiperOrigin-RevId: 276591806 --- runsc/testutil/testutil.go | 7 ------- 1 file changed, 7 deletions(-) (limited to 'runsc/testutil/testutil.go') diff --git a/runsc/testutil/testutil.go b/runsc/testutil/testutil.go index 26467bdc7..9632776d2 100644 --- a/runsc/testutil/testutil.go +++ b/runsc/testutil/testutil.go @@ -151,13 +151,6 @@ func TestConfig() *boot.Config { } } -// TestConfigWithRoot returns the default configuration to use in tests. -func TestConfigWithRoot(rootDir string) *boot.Config { - conf := TestConfig() - conf.RootDir = rootDir - return conf -} - // NewSpecWithArgs creates a simple spec with the given args suitable for use // in tests. func NewSpecWithArgs(args ...string) *specs.Spec { -- cgit v1.2.3