Resolve last batch of failing tests

fergusstrange · Oct 10, 2021 · fc52fea · fc52fea
1 parent c3f9f76
commit fc52fea
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/remote_fetch.go b/remote_fetch.go
@@ -59,7 +59,7 @@ func decompressResponse(resp *http.Response, cacheLocator CacheLocator, download
 	}
 
 	for _, file := range zipReader.File {
-		if strings.HasSuffix(file.FileHeader.Name, ".txz") {
+		if !file.FileHeader.FileInfo().IsDir() && strings.HasSuffix(file.FileHeader.Name, ".txz") {
 			archiveReader, err := file.Open()
 			if err != nil {
 				return errorExtractingPostgres(err)

diff --git a/remote_fetch_test.go b/remote_fetch_test.go
@@ -132,7 +132,7 @@ func Test_defaultRemoteFetchStrategy_ErrorWhenCannotExtractSubArchive(t *testing
 
 	err := remoteFetchStrategy()
 
-	assert.EqualError(t, err, "unable to extract postgres archive to "+dirBlockingExtract)
+	assert.Regexp(t, "^unable to extract postgres archive:.+$", err)
 }
 
 func Test_defaultRemoteFetchStrategy_ErrorWhenCannotCreateCacheDirectory(t *testing.T) {
@@ -167,7 +167,7 @@ func Test_defaultRemoteFetchStrategy_ErrorWhenCannotCreateCacheDirectory(t *test
 
 	err := remoteFetchStrategy()
 
-	assert.EqualError(t, err, "unable to extract postgres archive to "+cacheLocation)
+	assert.Regexp(t, "^unable to extract postgres archive:.+$", err)
 }
 
 func Test_defaultRemoteFetchStrategy_ErrorWhenCannotCreateSubArchiveFile(t *testing.T) {
@@ -199,7 +199,7 @@ func Test_defaultRemoteFetchStrategy_ErrorWhenCannotCreateSubArchiveFile(t *test
 
 	err := remoteFetchStrategy()
 
-	assert.EqualError(t, err, "unable to extract postgres archive to "+cacheLocation)
+	assert.Regexp(t, "^unable to extract postgres archive:.+$", err)
 }
 
 func Test_defaultRemoteFetchStrategy(t *testing.T) {