From ce948fc512e81930cf3ef2c25d5facb7033a0758 Mon Sep 17 00:00:00 2001 From: Jakob Borg Date: Thu, 20 Nov 2014 23:27:49 +0100 Subject: [PATCH] Don't leave read only dir around, fails clean --- internal/model/sharedpullerstate_test.go | 11 +++++++---- internal/model/testdata/read_only_dir/a | 0 2 files changed, 7 insertions(+), 4 deletions(-) delete mode 100644 internal/model/testdata/read_only_dir/a diff --git a/internal/model/sharedpullerstate_test.go b/internal/model/sharedpullerstate_test.go index c12e84a9..2beda1e2 100644 --- a/internal/model/sharedpullerstate_test.go +++ b/internal/model/sharedpullerstate_test.go @@ -17,7 +17,6 @@ package model import ( "os" - "path/filepath" "testing" ) @@ -68,13 +67,17 @@ func TestSourceFileBad(t *testing.T) { // Test creating temporary file inside read-only directory func TestReadOnlyDir(t *testing.T) { + // Create a read only directory, clean it up afterwards. + os.Mkdir("testdata/read_only_dir", 0555) + defer func() { + os.Chmod("testdata/read_only_dir", 0755) + os.RemoveAll("testdata/read_only_dir") + }() + s := sharedPullerState{ tempName: "testdata/read_only_dir/.temp_name", } - // Ensure dir is read-only (git doesn't store full permissions) - os.Chmod(filepath.Dir(s.tempName), 0555) - fd, err := s.tempFile() if err != nil { t.Fatal(err) diff --git a/internal/model/testdata/read_only_dir/a b/internal/model/testdata/read_only_dir/a deleted file mode 100644 index e69de29b..00000000