summaryrefslogtreecommitdiffhomepage
path: root/runsc/container/container_test.go
diff options
context:
space:
mode:
authorFabricio Voznika <fvoznika@google.com>2019-10-24 16:35:29 -0700
committergVisor bot <gvisor-bot@google.com>2019-10-24 16:36:54 -0700
commite8ba10c0085d404378ce649e018624b93cf4aa65 (patch)
tree4cbc5234e4accb9dbd3bf94a844b5b830d44092a /runsc/container/container_test.go
parente50a1f5739adc9bcb74456d365959ae718ff2197 (diff)
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
Diffstat (limited to 'runsc/container/container_test.go')
-rw-r--r--runsc/container/container_test.go3
1 files changed, 2 insertions, 1 deletions
diff --git a/runsc/container/container_test.go b/runsc/container/container_test.go
index c4c56b2e0..07eacaac0 100644
--- a/runsc/container/container_test.go
+++ b/runsc/container/container_test.go
@@ -1548,7 +1548,8 @@ func TestAbbreviatedIDs(t *testing.T) {
}
defer os.RemoveAll(rootDir)
- conf := testutil.TestConfigWithRoot(rootDir)
+ conf := testutil.TestConfig()
+ conf.RootDir = rootDir
cids := []string{
"foo-" + testutil.UniqueContainerID(),