Skip to content

Commit 7aab090

Browse files
Migrate TestInstallWithGitUrlLocalFileUri to lib_test.go and delete test_lib.py
1 parent ee0b938 commit 7aab090

File tree

4 files changed

+36
-56
lines changed

4 files changed

+36
-56
lines changed

Diff for: go.mod

+1
Original file line numberDiff line numberDiff line change
@@ -86,6 +86,7 @@ require (
8686
github.com/src-d/gcfg v1.4.0 // indirect
8787
github.com/subosito/gotenv v1.2.0 // indirect
8888
github.com/xanzy/ssh-agent v0.2.1 // indirect
89+
go.lsp.dev/uri v0.3.0
8990
golang.org/x/sys v0.0.0-20220520151302-bc2c85ada10a // indirect
9091
gopkg.in/ini.v1 v1.62.0 // indirect
9192
gopkg.in/src-d/go-billy.v4 v4.3.2 // indirect

Diff for: go.sum

+2
Original file line numberDiff line numberDiff line change
@@ -366,6 +366,8 @@ go.bug.st/testifyjson v1.1.1/go.mod h1:nZyy2icFbv3OE3zW3mGVOnC/GhWgb93LRu+29n2tJ
366366
go.etcd.io/etcd/api/v3 v3.5.0/go.mod h1:cbVKeC6lCfl7j/8jBhAK6aIYO9XOjdptoxU/nLQcPvs=
367367
go.etcd.io/etcd/client/pkg/v3 v3.5.0/go.mod h1:IJHfcCEKxYu1Os13ZdwCwIUTUVGYTSAM3YSwc9/Ac1g=
368368
go.etcd.io/etcd/client/v2 v2.305.0/go.mod h1:h9puh54ZTgAKtEbut2oe9P4L/oqKCVB6xsXlzd7alYQ=
369+
go.lsp.dev/uri v0.3.0 h1:KcZJmh6nFIBeJzTugn5JTU6OOyG0lDOo3R9KwTxTYbo=
370+
go.lsp.dev/uri v0.3.0/go.mod h1:P5sbO1IQR+qySTWOCnhnK7phBx+W3zbLqSMDJNTw88I=
369371
go.opencensus.io v0.21.0/go.mod h1:mSImk1erAIZhrmZN+AvHh14ztQfjbGwt4TtuofqLduU=
370372
go.opencensus.io v0.22.0/go.mod h1:+kGneAE2xo2IficOXnaByMWTGM9T73dGwxeWcUqIpI8=
371373
go.opencensus.io v0.22.2/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw=

Diff for: internal/integrationtest/lib/lib_test.go

+33
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@ import (
2020
"fmt"
2121
"io"
2222
"net/http"
23+
"runtime"
2324
"strings"
2425
"testing"
2526
"time"
@@ -28,6 +29,7 @@ import (
2829
"github.com/arduino/go-paths-helper"
2930
"github.com/stretchr/testify/require"
3031
"go.bug.st/testifyjson/requirejson"
32+
"go.lsp.dev/uri"
3133
"gopkg.in/src-d/go-git.v4"
3234
"gopkg.in/src-d/go-git.v4/plumbing/object"
3335
)
@@ -1400,3 +1402,34 @@ func TestInstallWithZipPathMultipleLibraries(t *testing.T) {
14001402
require.DirExists(t, wifiInstallDir.String())
14011403
require.DirExists(t, bleInstallDir.String())
14021404
}
1405+
1406+
func TestInstallWithGitUrlLocalFileUri(t *testing.T) {
1407+
if runtime.GOOS == "windows" {
1408+
t.Skip("Using a file uri as git url doesn't work on Windows, " +
1409+
"this must be removed when this issue is fixed: https://github.com/go-git/go-git/issues/247")
1410+
}
1411+
1412+
env, cli := integrationtest.CreateArduinoCLIWithEnvironment(t)
1413+
defer env.CleanUp()
1414+
1415+
envVar := cli.GetDefaultEnv()
1416+
envVar["ARDUINO_ENABLE_UNSAFE_LIBRARY_INSTALL"] = "true"
1417+
1418+
libInstallDir := cli.SketchbookDir().Join("libraries", "WiFi101")
1419+
// Verifies library is not installed
1420+
require.NoDirExists(t, libInstallDir.String())
1421+
1422+
// Clone repository locally
1423+
gitUrl := "https://github.com/arduino-libraries/WiFi101.git"
1424+
repoDir := cli.SketchbookDir().Join("WiFi101")
1425+
_, err := git.PlainClone(repoDir.String(), false, &git.CloneOptions{
1426+
URL: gitUrl,
1427+
})
1428+
require.NoError(t, err)
1429+
1430+
_, _, err = cli.RunWithCustomEnv(envVar, "lib", "install", "--git-url", uri.New(repoDir.String()).Filename())
1431+
require.NoError(t, err)
1432+
1433+
// Verifies library is installed
1434+
require.DirExists(t, libInstallDir.String())
1435+
}

Diff for: test/test_lib.py

-56
This file was deleted.

0 commit comments

Comments
 (0)