From 85cd7d5fc4e2fb434ad3f9ecf80887dc7c00df90 Mon Sep 17 00:00:00 2001
From: Mark D Horn <mark.d.horn@intel.com>
Date: Mon, 4 Mar 2019 13:51:15 -0800
Subject: [PATCH] Fix permissions before removing directories

Due to recent updates to tmpfs, we can no longer remove files
without write permission even if we are the owner.

Signed-off-by: Mark D Horn <mark.d.horn@intel.com>
---
 hostname/hostname_test.go | 8 ++++++++
 log/log_test.go           | 8 ++++++++
 2 files changed, 16 insertions(+)

diff --git a/hostname/hostname_test.go b/hostname/hostname_test.go
index 29326d2..5048e8c 100644
--- a/hostname/hostname_test.go
+++ b/hostname/hostname_test.go
@@ -113,6 +113,10 @@ func TestFailedToCreateDir(t *testing.T) {
 	}
 
 	defer func() {
+		err = os.Chmod(rootDir, 0700)
+		if err != nil {
+			t.Fatal(err)
+		}
 		_ = os.RemoveAll(dir)
 	}()
 
@@ -142,6 +146,10 @@ func TestFailedToWrite(t *testing.T) {
 	}
 
 	defer func() {
+		err = os.Chmod(etcDir, 0700)
+		if err != nil {
+			t.Fatal(err)
+		}
 		_ = os.RemoveAll(dir)
 	}()
 
diff --git a/log/log_test.go b/log/log_test.go
index 8cd6f0a..eb83bfa 100644
--- a/log/log_test.go
+++ b/log/log_test.go
@@ -243,6 +243,10 @@ func TestFailedToArchiveUnwritableFile(t *testing.T) {
 	}
 
 	defer func() {
+		err = os.Chmod(rootDir, 0700)
+		if err != nil {
+			t.Fatal(err)
+		}
 		_ = os.RemoveAll(dir)
 	}()
 
@@ -272,6 +276,10 @@ func TestFailedToSetOutput(t *testing.T) {
 	}
 
 	defer func() {
+		err = os.Chmod(rootDir, 0700)
+		if err != nil {
+			t.Fatal(err)
+		}
 		_ = os.RemoveAll(dir)
 	}()