Fix some storage tests on Windows

Author: code-asher

storage/local.go

@@ -52,7 +52,7 @@ func (s *Local) AddExtension(ctx context.Context, source string) (*Extension, er
 	// Extract the zip to the correct path.
 	identity := manifest.Metadata.Identity
 	dir := filepath.Join(s.ExtDir, identity.Publisher, identity.ID, identity.Version)
-	err = ExtractZip(vsixBytes, func(name string) (io.Writer, error) {
+	err = ExtractZip(vsixBytes, func(name string) (io.WriteCloser, error) {
 		path := filepath.Join(dir, name)
 		err := os.MkdirAll(filepath.Dir(path), 0o755)
 		if err != nil {
@@ -71,6 +71,7 @@ func (s *Local) AddExtension(ctx context.Context, source string) (*Extension, er
 	if err != nil {
 		return nil, err
 	}
+	defer dst.Close()
 	_, err = io.Copy(dst, bytes.NewReader(vsixBytes))
 	if err != nil {
 		return nil, err
@@ -159,6 +160,7 @@ func (s *Local) Manifest(ctx context.Context, publisher, extension, version stri
 	if err != nil {
 		return nil, err
 	}
+	defer reader.Close()
 
 	return parseVSIXManifest(reader)
 }

storage/storage_test.go

@@ -12,6 +12,7 @@ import (
 	"net/http/httptest"
 	"os"
 	"path/filepath"
+	"runtime"
 	"sort"
 	"strconv"
 	"testing"
@@ -261,6 +262,7 @@ func TestAddExtension(t *testing.T) {
 			handler  http.HandlerFunc
 			name     string
 			setup    func(extdir string) (string, error)
+			skip     bool
 		}{
 			{
 				name:     "OK",
@@ -297,8 +299,11 @@ func TestAddExtension(t *testing.T) {
 				},
 			},
 			{
-				name:     "ExtensionDirPerms",
-				error:    "permission denied",
+				name:  "ExtensionDirPerms",
+				error: "permission denied",
+				// It does not appear possible to create a directory that is not
+				// writable on Windows?
+				skip:     runtime.GOOS == "windows",
 				expected: testutil.Extensions[0],
 				setup: func(extdir string) (string, error) {
 					// Disallow writing to the extension directory.
@@ -324,6 +329,9 @@ func TestAddExtension(t *testing.T) {
 			test := test
 			t.Run(test.name, func(t *testing.T) {
 				t.Parallel()
+				if test.skip {
+					t.Skip()
+				}
 
 				handler := test.handler
 				if handler == nil {
@@ -362,10 +370,12 @@ func TestAddExtension(t *testing.T) {
 		t.Parallel()
 
 		tests := []struct {
-			error    string
-			expected testutil.Extension
-			name     string
-			source   func(extdir string) (string, error)
+			error     string
+			errorType error
+			expected  testutil.Extension
+			name      string
+			skip      bool
+			source    func(extdir string) (string, error)
 		}{
 			{
 				name:     "OK",
@@ -379,8 +389,8 @@ func TestAddExtension(t *testing.T) {
 				},
 			},
 			{
-				name:  "NotFound",
-				error: "foo\\.vsix.+no such file",
+				name:      "NotFound",
+				errorType: os.ErrNotExist,
 				source: func(extdir string) (string, error) {
 					return filepath.Join(extdir, "foo.vsix"), nil
 				},
@@ -396,6 +406,9 @@ func TestAddExtension(t *testing.T) {
 			{
 				name:  "Unreadable",
 				error: "permission denied",
+				// It does not appear possible to create a file that is not readable on
+				// Windows?
+				skip: runtime.GOOS == "windows",
 				source: func(extdir string) (string, error) {
 					vsixPath := filepath.Join(extdir, "extension.vsix")
 					return vsixPath, os.WriteFile(vsixPath, []byte{}, 0o222)
@@ -407,6 +420,9 @@ func TestAddExtension(t *testing.T) {
 			test := test
 			t.Run(test.name, func(t *testing.T) {
 				t.Parallel()
+				if test.skip {
+					t.Skip()
+				}
 
 				extdir := t.TempDir()
 				s := &storage.Local{ExtDir: extdir}
@@ -415,7 +431,10 @@ func TestAddExtension(t *testing.T) {
 				require.NoError(t, err)
 
 				got, err := s.AddExtension(context.Background(), source)
-				if test.error != "" {
+				if test.errorType != nil {
+					require.Error(t, err)
+					require.True(t, errors.Is(err, test.errorType))
+				} else if test.error != "" {
 					require.Error(t, err)
 					require.Regexp(t, test.error, err.Error())
 				} else {

storage/zip.go

@@ -51,17 +51,19 @@ func GetZipFileReader(rawZip []byte, filename string) (io.ReadCloser, error) {
 // ExtractZip extracts a zip's files to the specified directory.  The writer is
 // expected to create any necessary directories and return a writer for writing
 // a file.
-func ExtractZip(rawZip []byte, writer func(name string) (io.Writer, error)) error {
+func ExtractZip(rawZip []byte, writer func(name string) (io.WriteCloser, error)) error {
 	_, err := WalkZip(rawZip, func(zf *zip.File) (stop bool, err error) {
 		if !zf.FileInfo().IsDir() {
 			dst, err := writer(zf.Name)
 			if err != nil {
 				return false, err
 			}
+			defer dst.Close()
 			src, err := zf.Open()
 			if err != nil {
 				return false, err
 			}
+			defer src.Close()
 			_, err = io.Copy(dst, src)
 			if err != nil {
 				return false, err

storage/zip_test.go

@@ -55,24 +55,30 @@ func TestGetZipFileReader(t *testing.T) {
 	require.Error(t, err)
 }
 
+type nopCloser struct {
+	io.Writer
+}
+
+func (nopCloser) Close() error { return nil }
+
 func TestExtract(t *testing.T) {
 	t.Parallel()
 
 	buffer, err := createZip()
 	require.NoError(t, err)
 
 	t.Run("Error", func(t *testing.T) {
-		err := ExtractZip(buffer, func(name string) (io.Writer, error) {
+		err := ExtractZip(buffer, func(name string) (io.WriteCloser, error) {
 			return nil, errors.New("error")
 		})
 		require.Error(t, err)
 	})
 
 	t.Run("OK", func(t *testing.T) {
 		called := []string{}
-		err := ExtractZip(buffer, func(name string) (io.Writer, error) {
+		err := ExtractZip(buffer, func(name string) (io.WriteCloser, error) {
 			called = append(called, name)
-			return io.Discard, nil
+			return nopCloser{io.Discard}, nil
 		})
 		require.NoError(t, err)
 		require.Equal(t, []string{"alpha.txt", "beta.txt", "charlie.txt"}, called)