Merge pull request restic#3850 from lbausch/go1.19

Update tests to Go 1.19
octoleo · Aug 7, 2022 · 9ad3ad5 · 9ad3ad5
2 parents 2930a10 + f3fdc66
commit 9ad3ad5
Show file tree

Hide file tree

Showing 10 changed files with 142 additions and 136 deletions.
diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
@@ -9,7 +9,7 @@ on:
   pull_request:
 
 env:
-  latest_go: "1.18.x"
+  latest_go: "1.19.x"
   GO111MODULE: on
 
 jobs:
@@ -19,24 +19,30 @@ jobs:
         # list of jobs to run:
         include:
           - job_name: Windows
-            go: 1.18.x
+            go: 1.19.x
             os: windows-latest
             install_verb: install
 
           - job_name: macOS
-            go: 1.18.x
+            go: 1.19.x
             os: macOS-latest
             test_fuse: false
             install_verb: install
 
           - job_name: Linux
-            go: 1.18.x
+            go: 1.19.x
             os: ubuntu-latest
             test_cloud_backends: true
             test_fuse: true
             check_changelog: true
             install_verb: install
 
+          - job_name: Linux
+            go: 1.18.x
+            os: ubuntu-latest
+            test_fuse: true
+            install_verb: install
+
           - job_name: Linux
             go: 1.17.x
             os: ubuntu-latest
@@ -260,7 +266,7 @@ jobs:
         uses: golangci/golangci-lint-action@v2
         with:
           # Required: the version of golangci-lint is required and must be specified without patch version: we always use the latest patch version.
-          version: v1.45
+          version: v1.48
           # Optional: show only new issues if it's a pull request. The default value is `false`.
           only-new-issues: true
           args: --verbose --timeout 5m

diff --git a/internal/restic/snapshot_policy.go b/internal/restic/snapshot_policy.go
@@ -190,7 +190,7 @@ type KeepReason struct {
 // according to the policy p. list is sorted in the process. reasons contains
 // the reasons to keep each snapshot, it is in the same order as keep.
 func ApplyPolicy(list Snapshots, p ExpirePolicy) (keep, remove Snapshots, reasons []KeepReason) {
-	sort.Sort(list)
+	sort.Stable(list)
 
 	if p.Empty() {
 		for _, sn := range list {

diff --git a/internal/restic/testdata/policy_keep_snapshots_0 b/internal/restic/testdata/policy_keep_snapshots_0
@@ -153,14 +153,7 @@
     {
       "time": "2015-10-22T10:20:30Z",
       "tree": null,
-      "paths": [
-        "path1",
-        "path2"
-      ],
-      "tags": [
-        "foo",
-        "bar"
-      ]
+      "paths": null
     },
     {
       "time": "2015-10-22T10:20:30Z",
@@ -174,12 +167,19 @@
     {
       "time": "2015-10-22T10:20:30Z",
       "tree": null,
-      "paths": null
+      "paths": null,
+      "tags": [
+        "foo",
+        "bar"
+      ]
     },
     {
       "time": "2015-10-22T10:20:30Z",
       "tree": null,
-      "paths": null,
+      "paths": [
+        "path1",
+        "path2"
+      ],
       "tags": [
         "foo",
         "bar"
@@ -915,14 +915,7 @@
       "snapshot": {
         "time": "2015-10-22T10:20:30Z",
         "tree": null,
-        "paths": [
-          "path1",
-          "path2"
-        ],
-        "tags": [
-          "foo",
-          "bar"
-        ]
+        "paths": null
       },
       "matches": [
         "policy is empty"
@@ -948,7 +941,11 @@
       "snapshot": {
         "time": "2015-10-22T10:20:30Z",
         "tree": null,
-        "paths": null
+        "paths": null,
+        "tags": [
+          "foo",
+          "bar"
+        ]
       },
       "matches": [
         "policy is empty"
@@ -959,7 +956,10 @@
       "snapshot": {
         "time": "2015-10-22T10:20:30Z",
         "tree": null,
-        "paths": null,
+        "paths": [
+          "path1",
+          "path2"
+        ],
         "tags": [
           "foo",
           "bar"

diff --git a/internal/restic/testdata/policy_keep_snapshots_18 b/internal/restic/testdata/policy_keep_snapshots_18
@@ -3,10 +3,7 @@
     {
       "time": "2015-10-22T10:20:30Z",
       "tree": null,
-      "paths": [
-        "path1",
-        "path2"
-      ],
+      "paths": null,
       "tags": [
         "foo",
         "bar"
@@ -24,7 +21,10 @@
     {
       "time": "2015-10-22T10:20:30Z",
       "tree": null,
-      "paths": null,
+      "paths": [
+        "path1",
+        "path2"
+      ],
       "tags": [
         "foo",
         "bar"
@@ -157,10 +157,7 @@
       "snapshot": {
         "time": "2015-10-22T10:20:30Z",
         "tree": null,
-        "paths": [
-          "path1",
-          "path2"
-        ],
+        "paths": null,
         "tags": [
           "foo",
           "bar"
@@ -190,7 +187,10 @@
       "snapshot": {
         "time": "2015-10-22T10:20:30Z",
         "tree": null,
-        "paths": null,
+        "paths": [
+          "path1",
+          "path2"
+        ],
         "tags": [
           "foo",
           "bar"

diff --git a/internal/restic/testdata/policy_keep_snapshots_19 b/internal/restic/testdata/policy_keep_snapshots_19
@@ -3,10 +3,7 @@
     {
       "time": "2015-10-22T10:20:30Z",
       "tree": null,
-      "paths": [
-        "path1",
-        "path2"
-      ],
+      "paths": null,
       "tags": [
         "foo",
         "bar"
@@ -24,7 +21,10 @@
     {
       "time": "2015-10-22T10:20:30Z",
       "tree": null,
-      "paths": null,
+      "paths": [
+        "path1",
+        "path2"
+      ],
       "tags": [
         "foo",
         "bar"
@@ -45,10 +45,7 @@
       "snapshot": {
         "time": "2015-10-22T10:20:30Z",
         "tree": null,
-        "paths": [
-          "path1",
-          "path2"
-        ],
+        "paths": null,
         "tags": [
           "foo",
           "bar"
@@ -78,7 +75,10 @@
       "snapshot": {
         "time": "2015-10-22T10:20:30Z",
         "tree": null,
-        "paths": null,
+        "paths": [
+          "path1",
+          "path2"
+        ],
         "tags": [
           "foo",
           "bar"

diff --git a/internal/restic/testdata/policy_keep_snapshots_20 b/internal/restic/testdata/policy_keep_snapshots_20
@@ -3,10 +3,7 @@
     {
       "time": "2015-10-22T10:20:30Z",
       "tree": null,
-      "paths": [
-        "path1",
-        "path2"
-      ],
+      "paths": null,
       "tags": [
         "foo",
         "bar"
@@ -24,7 +21,10 @@
     {
       "time": "2015-10-22T10:20:30Z",
       "tree": null,
-      "paths": null,
+      "paths": [
+        "path1",
+        "path2"
+      ],
       "tags": [
         "foo",
         "bar"
@@ -165,10 +165,7 @@
       "snapshot": {
         "time": "2015-10-22T10:20:30Z",
         "tree": null,
-        "paths": [
-          "path1",
-          "path2"
-        ],
+        "paths": null,
         "tags": [
           "foo",
           "bar"
@@ -200,7 +197,10 @@
       "snapshot": {
         "time": "2015-10-22T10:20:30Z",
         "tree": null,
-        "paths": null,
+        "paths": [
+          "path1",
+          "path2"
+        ],
         "tags": [
           "foo",
           "bar"

diff --git a/internal/restic/testdata/policy_keep_snapshots_26 b/internal/restic/testdata/policy_keep_snapshots_26
@@ -153,14 +153,7 @@
     {
       "time": "2015-10-22T10:20:30Z",
       "tree": null,
-      "paths": [
-        "path1",
-        "path2"
-      ],
-      "tags": [
-        "foo",
-        "bar"
-      ]
+      "paths": null
     },
     {
       "time": "2015-10-22T10:20:30Z",
@@ -174,12 +167,19 @@
     {
       "time": "2015-10-22T10:20:30Z",
       "tree": null,
-      "paths": null
+      "paths": null,
+      "tags": [
+        "foo",
+        "bar"
+      ]
     },
     {
       "time": "2015-10-22T10:20:30Z",
       "tree": null,
-      "paths": null,
+      "paths": [
+        "path1",
+        "path2"
+      ],
       "tags": [
         "foo",
         "bar"
@@ -666,14 +666,7 @@
       "snapshot": {
         "time": "2015-10-22T10:20:30Z",
         "tree": null,
-        "paths": [
-          "path1",
-          "path2"
-        ],
-        "tags": [
-          "foo",
-          "bar"
-        ]
+        "paths": null
       },
       "matches": [
         "within 1y1m1d"
@@ -699,7 +692,11 @@
       "snapshot": {
         "time": "2015-10-22T10:20:30Z",
         "tree": null,
-        "paths": null
+        "paths": null,
+        "tags": [
+          "foo",
+          "bar"
+        ]
       },
       "matches": [
         "within 1y1m1d"
@@ -710,7 +707,10 @@
       "snapshot": {
         "time": "2015-10-22T10:20:30Z",
         "tree": null,
-        "paths": null,
+        "paths": [
+          "path1",
+          "path2"
+        ],
         "tags": [
           "foo",
           "bar"