diff --git a/arduino/libraries/librariesmanager/librariesmanager.go b/arduino/libraries/librariesmanager/librariesmanager.go index 44b9186a08d..08339066005 100644 --- a/arduino/libraries/librariesmanager/librariesmanager.go +++ b/arduino/libraries/librariesmanager/librariesmanager.go @@ -24,6 +24,7 @@ import ( "github.com/arduino/arduino-cli/arduino/cores" "github.com/arduino/arduino-cli/arduino/libraries" "github.com/arduino/arduino-cli/arduino/libraries/librariesindex" + "github.com/arduino/arduino-cli/arduino/utils" paths "github.com/arduino/go-paths-helper" "github.com/pmylund/sortutil" "github.com/sirupsen/logrus" @@ -209,7 +210,8 @@ func (sc *LibrariesManager) LoadLibrariesFromDir(librariesDir *LibrariesDir) err // name and version or, if the version is nil, the library installed // in the sketchbook. func (sc *LibrariesManager) FindByReference(libRef *librariesindex.Reference) *libraries.Library { - alternatives, have := sc.Libraries[libRef.Name] + saneName := utils.SanitizeName(libRef.Name) + alternatives, have := sc.Libraries[saneName] if !have { return nil } diff --git a/test/conftest.py b/test/conftest.py index a11e46e2fd0..ca83926d589 100644 --- a/test/conftest.py +++ b/test/conftest.py @@ -56,7 +56,7 @@ def run_command(pytestconfig, data_dir, downloads_dir, working_dir): Useful reference: http://docs.pyinvoke.org/en/1.2/api/runners.html#invoke.runners.Result """ - cli_path = os.path.join(pytestconfig.rootdir, "..", "arduino-cli") + cli_path = os.path.join(str(pytestconfig.rootdir), "..", "arduino-cli") env = { "ARDUINO_DATA_DIR": data_dir, "ARDUINO_DOWNLOADS_DIR": downloads_dir,