diff --git a/tests/commands/test_check.py b/tests/commands/test_check.py index 116e4a52..998d44cf 100644 --- a/tests/commands/test_check.py +++ b/tests/commands/test_check.py @@ -357,7 +357,7 @@ int main() { assert low_result.exit_code != 0 -def test_check_pvs_studio_free_license(clirunner, isolated_pio_core, tmpdir): +def test_check_pvs_studio_free_license(clirunner, tmpdir): config = """ [env:test] platform = teensy diff --git a/tests/commands/test_ci.py b/tests/commands/test_ci.py index 0f7aceed..f3308a6a 100644 --- a/tests/commands/test_ci.py +++ b/tests/commands/test_ci.py @@ -114,13 +114,13 @@ def test_ci_lib_and_board(clirunner, tmpdir_factory, validate_cliresult): [ join( storage_dir, - "OneWire_ID1", + "OneWire", "examples", "DS2408_Switch", "DS2408_Switch.pde", ), "-l", - join(storage_dir, "OneWire_ID1"), + join(storage_dir, "OneWire"), "-b", "uno", ], diff --git a/tests/commands/test_lib.py b/tests/commands/test_lib.py index 3341ef71..f51b9dc2 100644 --- a/tests/commands/test_lib.py +++ b/tests/commands/test_lib.py @@ -56,14 +56,14 @@ def test_global_install_registry(clirunner, validate_cliresult, isolated_pio_cor items1 = [d.basename for d in isolated_pio_core.join("lib").listdir()] items2 = [ - "ArduinoJson_ID64", - "ArduinoJson_ID64@5.10.1", - "NeoPixelBus_ID547", - "AsyncMqttClient_ID346", - "ESPAsyncTCP_ID305", - "AsyncTCP_ID1826", - "Adafruit PN532_ID29", - "Adafruit BusIO_ID6214", + "ArduinoJson", + "ArduinoJson@5.10.1", + "NeoPixelBus", + "AsyncMqttClient", + "ESPAsyncTCP", + "AsyncTCP", + "Adafruit PN532", + "Adafruit BusIO", ] assert set(items1) == set(items2) @@ -94,7 +94,7 @@ def test_global_install_archive(clirunner, validate_cliresult, isolated_pio_core assert result.exit_code != 0 items1 = [d.basename for d in isolated_pio_core.join("lib").listdir()] - items2 = ["ArduinoJson", "SomeLib_ID54", "OneWire_ID1", "ESP32WebServer"] + items2 = ["ArduinoJson", "SomeLib_ID54", "OneWire", "ESP32WebServer"] assert set(items1) >= set(items2) @@ -135,11 +135,6 @@ def test_install_duplicates(clirunner, validate_cliresult, without_internet): validate_cliresult(result) assert "is already installed" in result.output - # by ID - result = clirunner.invoke(cmd_lib, ["-g", "install", "29"]) - validate_cliresult(result) - assert "is already installed" in result.output - # archive result = clirunner.invoke( cmd_lib, @@ -276,7 +271,7 @@ def test_global_lib_uninstall(clirunner, validate_cliresult, isolated_pio_core): [ "-g", "uninstall", - "1", + "OneWire", "https://github.com/bblanchon/ArduinoJson.git", "ArduinoJson@!=5.6.7", "Adafruit PN532", @@ -290,15 +285,15 @@ def test_global_lib_uninstall(clirunner, validate_cliresult, isolated_pio_core): "platformio-libmirror", "PubSubClient", "ArduinoJson@src-69ebddd821f771debe7ee734d3c7fa81", - "ESPAsyncTCP_ID305", + "ESPAsyncTCP", "ESP32WebServer", - "NeoPixelBus_ID547", + "NeoPixelBus", "PJON", - "AsyncMqttClient_ID346", - "ArduinoJson_ID64", + "AsyncMqttClient", + "ArduinoJson", "SomeLib_ID54", "PJON@src-79de467ebe19de18287becff0a1fb42d", - "AsyncTCP_ID1826", + "AsyncTCP", ] assert set(items1) == set(items2) diff --git a/tests/commands/test_update.py b/tests/commands/test_update.py index 9325e501..1817be33 100644 --- a/tests/commands/test_update.py +++ b/tests/commands/test_update.py @@ -15,8 +15,8 @@ from platformio.commands.update import cli as cmd_update -def test_update(clirunner, validate_cliresult): - matches = ("Platform Manager", "Up-to-date", "Library Manager") +def test_update(clirunner, validate_cliresult, isolated_pio_core): + matches = ("Platform Manager", "Library Manager") result = clirunner.invoke(cmd_update, ["--only-check"]) validate_cliresult(result) assert all([m in result.output for m in matches])