[skip-changelog] upgrade go-paths-helper to 1.6.0 (#1310)

cmaglie · web-flow · commit 93ae80cb6ec9 · 2021-06-04T15:51:55.000+02:00
* upgrade go-paths-helper to 1.6.0

* Fixed tests for new go-path library release
diff --git a/arduino/builder/builder_test.go b/arduino/builder/builder_test.go
@@ -36,11 +36,11 @@ func tmpDirOrDie() string {
 }
 
 func TestGenBuildPath(t *testing.T) {
-	want := filepath.Join(os.TempDir(), "arduino-sketch-ACBD18DB4CC2F85CEDEF654FCCC4A4D8")
-	assert.Equal(t, want, builder.GenBuildPath(paths.New("foo")).String())
+	want := paths.TempDir().Join("arduino-sketch-ACBD18DB4CC2F85CEDEF654FCCC4A4D8")
+	assert.True(t, builder.GenBuildPath(paths.New("foo")).EquivalentTo(want))
 
-	want = filepath.Join(os.TempDir(), "arduino-sketch-D41D8CD98F00B204E9800998ECF8427E")
-	assert.Equal(t, want, builder.GenBuildPath(nil).String())
+	want = paths.TempDir().Join("arduino-sketch-D41D8CD98F00B204E9800998ECF8427E")
+	assert.True(t, builder.GenBuildPath(nil).EquivalentTo(want))
 }
 
 func TestEnsureBuildPathExists(t *testing.T) {
diff --git a/go.mod b/go.mod
@@ -4,7 +4,7 @@ go 1.14
 
 require (
 	github.com/arduino/board-discovery v0.0.0-20180823133458-1ba29327fb0c
-	github.com/arduino/go-paths-helper v1.5.0
+	github.com/arduino/go-paths-helper v1.6.0
 	github.com/arduino/go-properties-orderedmap v1.3.0
 	github.com/arduino/go-timeutils v0.0.0-20171220113728-d1dd9e313b1b
 	github.com/arduino/go-win32-utils v0.0.0-20180330194947-ed041402e83b
diff --git a/go.sum b/go.sum
@@ -18,6 +18,8 @@ github.com/arduino/go-paths-helper v1.4.0 h1:ilnseAdxmN1bFnLxxXHRtcdmt9jBf3O4jtY
 github.com/arduino/go-paths-helper v1.4.0/go.mod h1:V82BWgAAp4IbmlybxQdk9Bpkz8M4Qyx+RAFKaG9NuvU=
 github.com/arduino/go-paths-helper v1.5.0 h1:RVo189hD+GhUS1rQ3gixwK1nSbvVR8MGIGa7Gxv2bdM=
 github.com/arduino/go-paths-helper v1.5.0/go.mod h1:V82BWgAAp4IbmlybxQdk9Bpkz8M4Qyx+RAFKaG9NuvU=
+github.com/arduino/go-paths-helper v1.6.0 h1:S7/d7DqB9XlnvF9KrgSiGmo2oWKmYW6O/DTjj3Bijx4=
+github.com/arduino/go-paths-helper v1.6.0/go.mod h1:V82BWgAAp4IbmlybxQdk9Bpkz8M4Qyx+RAFKaG9NuvU=
 github.com/arduino/go-properties-orderedmap v1.3.0 h1:4No/vQopB36e7WUIk6H6TxiSEJPiMrVOCZylYmua39o=
 github.com/arduino/go-properties-orderedmap v1.3.0/go.mod h1:DKjD2VXY/NZmlingh4lSFMEYCVubfeArCsGPGDwb2yk=
 github.com/arduino/go-timeutils v0.0.0-20171220113728-d1dd9e313b1b h1:9hDi4F2st6dbLC3y4i02zFT5quS4X6iioWifGlVwfy4=

Original file line number	Diff line number	Diff line change
`@@ -36,11 +36,11 @@ func tmpDirOrDie() string {`
`36`	`36`	`}`
`37`	`37`
`38`	`38`	`func TestGenBuildPath(t *testing.T) {`
`39`		`- want := filepath.Join(os.TempDir(), "arduino-sketch-ACBD18DB4CC2F85CEDEF654FCCC4A4D8")`
`40`		`- assert.Equal(t, want, builder.GenBuildPath(paths.New("foo")).String())`
	`39`	`+ want := paths.TempDir().Join("arduino-sketch-ACBD18DB4CC2F85CEDEF654FCCC4A4D8")`
	`40`	`+ assert.True(t, builder.GenBuildPath(paths.New("foo")).EquivalentTo(want))`
`41`	`41`
`42`		`- want = filepath.Join(os.TempDir(), "arduino-sketch-D41D8CD98F00B204E9800998ECF8427E")`
`43`		`- assert.Equal(t, want, builder.GenBuildPath(nil).String())`
	`42`	`+ want = paths.TempDir().Join("arduino-sketch-D41D8CD98F00B204E9800998ECF8427E")`
	`43`	`+ assert.True(t, builder.GenBuildPath(nil).EquivalentTo(want))`
`44`	`44`	`}`
`45`	`45`
`46`	`46`	`func TestEnsureBuildPathExists(t *testing.T) {`