Separate multiline Go statements

[onechat] / backup_archive_test.go

diff --git a/backup_archive_test.go b/backup_archive_test.go
index c3cbcbbf8141d107dc13fa08271591c08f3a2909..dff09f8533e224249c87b48b17295776d706b0c8 100644 (file)
--- a/backup_archive_test.go
+++ b/backup_archive_test.go
@@ -2,7 +2,6 @@ package main
 
 import (
        "archive/tar"
 
 import (
        "archive/tar"

-       "compress/gzip"

        "os"
        "path/filepath"
        "testing"
        "os"
        "path/filepath"
        "testing"


@@ -112,6 +111,7 @@ func TestRestoreRejectsUnsafeArchiveEntries(t *testing.T) {
                        },
                },
        }
                        },
                },
        }

+

        for _, tc := range testCases {
                t.Run(tc.name, func(t *testing.T) {
                        archive := backupTestArchive(t, tc.header)
        for _, tc := range testCases {
                t.Run(tc.name, func(t *testing.T) {
                        archive := backupTestArchive(t, tc.header)


@@ -138,24 +138,3 @@ func TestBackupFailureKeepsTheDestination(t *testing.T) {
        require.NoError(t, err)
        require.Len(t, entries, 1)
 }
        require.NoError(t, err)
        require.Len(t, entries, 1)
 }

-
-func backupTestArchive(t *testing.T, headers ...tar.Header) string {
-       t.Helper()
-
-       path := filepath.Join(t.TempDir(), "input.tar.gz")
-       file, err := os.Create(path)
-       require.NoError(t, err)
-
-       compressed := gzip.NewWriter(file)
-
-       archive := tar.NewWriter(compressed)
-       for _, header := range headers {
-               require.NoError(t, archive.WriteHeader(&header))
-       }
-
-       require.NoError(t, archive.Close())
-       require.NoError(t, compressed.Close())
-       require.NoError(t, file.Close())
-
-       return path
-}