From 3ed472dc8d690674be5a19a64b0a7d79eb3abb14 Mon Sep 17 00:00:00 2001 From: Peng Tao Date: Wed, 25 Dec 2019 02:07:52 -0800 Subject: [PATCH] store: UT tmp path should be random Otherwise we might end up using the previously created store instead. Signed-off-by: Peng Tao --- virtcontainers/store/filesystem_backend_test.go | 6 +++++- virtcontainers/store/manager_test.go | 7 +++++-- 2 files changed, 10 insertions(+), 3 deletions(-) diff --git a/virtcontainers/store/filesystem_backend_test.go b/virtcontainers/store/filesystem_backend_test.go index 28589ae57f..2b1f9e5dc7 100644 --- a/virtcontainers/store/filesystem_backend_test.go +++ b/virtcontainers/store/filesystem_backend_test.go @@ -20,7 +20,11 @@ type TestNoopStructure struct { Field2 string } -var rootPath = "/tmp/root1/" +var rootPath = func() string { + dir, _ := ioutil.TempDir("", "") + return dir +}() + var expectedFilesystemData = "{\"Field1\":\"value1\",\"Field2\":\"value2\"}" func TestStoreFilesystemStore(t *testing.T) { diff --git a/virtcontainers/store/manager_test.go b/virtcontainers/store/manager_test.go index 00c80f2652..713cb30bd3 100644 --- a/virtcontainers/store/manager_test.go +++ b/virtcontainers/store/manager_test.go @@ -23,14 +23,17 @@ var sandboxDirState = "" var sandboxDirLock = "" var sandboxFileState = "" var sandboxFileLock = "" -var storeRoot = "file:///tmp/root1/" +var storeRoot, storeRootDir = func() (string, string) { + dir, _ := ioutil.TempDir("", "") + return "file://" + dir, dir +}() func TestNewStore(t *testing.T) { s, err := New(context.Background(), storeRoot) assert.Nil(t, err) assert.Equal(t, s.scheme, "file") assert.Equal(t, s.host, "") - assert.Equal(t, s.path, "/tmp/root1/") + assert.Equal(t, s.path, storeRootDir) } func TestDeleteStore(t *testing.T) {