From a0f49a91e434cd60d59c35b7e4438b469559f68e Mon Sep 17 00:00:00 2001
From: Peng Tao <bergwolf@hyper.sh>
Date: Thu, 11 Apr 2019 23:21:27 -0700
Subject: [PATCH] ut: fix UT failure due to non-root

We should allow UT to run without root.

Signed-off-by: Peng Tao <bergwolf@hyper.sh>
---
 virtcontainers/container_test.go        | 4 ++++
 virtcontainers/hyperstart_agent_test.go | 6 ++++++
 virtcontainers/kata_agent_test.go       | 6 ++++++
 3 files changed, 16 insertions(+)

diff --git a/virtcontainers/container_test.go b/virtcontainers/container_test.go
index 8dfdafc384..c164b72be7 100644
--- a/virtcontainers/container_test.go
+++ b/virtcontainers/container_test.go
@@ -137,6 +137,10 @@ func TestContainerRemoveDrive(t *testing.T) {
 }
 
 func testSetupFakeRootfs(t *testing.T) (testRawFile, loopDev, mntDir string, err error) {
+	if os.Geteuid() != 0 {
+		t.Skip(testDisabledAsNonRoot)
+	}
+
 	tmpDir, err := ioutil.TempDir("", "")
 	if err != nil {
 		t.Fatal(err)
diff --git a/virtcontainers/hyperstart_agent_test.go b/virtcontainers/hyperstart_agent_test.go
index 6d8aaae30b..b65c190861 100644
--- a/virtcontainers/hyperstart_agent_test.go
+++ b/virtcontainers/hyperstart_agent_test.go
@@ -282,6 +282,12 @@ func TestHyperCopyFile(t *testing.T) {
 func TestHyperCleanupSandbox(t *testing.T) {
 	assert := assert.New(t)
 
+	defaultSharedDirSaved := defaultSharedDir
+	defaultSharedDir, _ = ioutil.TempDir("", "hyper-cleanup")
+	defer func() {
+		defaultSharedDir = defaultSharedDirSaved
+	}()
+
 	s := Sandbox{
 		id: "testFoo",
 	}
diff --git a/virtcontainers/kata_agent_test.go b/virtcontainers/kata_agent_test.go
index 378c4fc657..caad5d782f 100644
--- a/virtcontainers/kata_agent_test.go
+++ b/virtcontainers/kata_agent_test.go
@@ -935,6 +935,12 @@ func TestKataCopyFile(t *testing.T) {
 func TestKataCleanupSandbox(t *testing.T) {
 	assert := assert.New(t)
 
+	kataHostSharedDirSaved := kataHostSharedDir
+	kataHostSharedDir, _ = ioutil.TempDir("", "kata-cleanup")
+	defer func() {
+		kataHostSharedDir = kataHostSharedDirSaved
+	}()
+
 	s := Sandbox{
 		id: "testFoo",
 	}