From 6186b425d4ecd89a79c76c9d5d0e86e22c11a4ec Mon Sep 17 00:00:00 2001 From: Ivan Kravets Date: Sat, 1 Jun 2019 15:38:55 +0300 Subject: [PATCH] Typo fix --- platformio/project/config.py | 2 +- tests/test_projectconf.py | 11 +++++++++-- 2 files changed, 10 insertions(+), 3 deletions(-) diff --git a/platformio/project/config.py b/platformio/project/config.py index f9b75fa0..c9ba6b14 100644 --- a/platformio/project/config.py +++ b/platformio/project/config.py @@ -278,7 +278,7 @@ class ProjectConfig(object): for name in option.oldnames}) for section in self._parser.sections(): - if not section.startswith("env:") or section != "platformio": + if not section.startswith("env:") and section != "platformio": continue for option in self._parser.options(section): # obsolete diff --git a/tests/test_projectconf.py b/tests/test_projectconf.py index 8717e8da..eeafb54e 100644 --- a/tests/test_projectconf.py +++ b/tests/test_projectconf.py @@ -16,6 +16,7 @@ import os import pytest +from platformio.exception import UnknownEnvNames from platformio.project.config import ConfigParser, ProjectConfig BASE_CONFIG = """ @@ -46,6 +47,7 @@ build_flags = ${custom.debug_flags} ${custom.extra_flags} EXTRA_ENVS_CONFIG = """ [env:extra_1] build_flags = ${custom.lib_flags} ${custom.debug_flags} +lib_install = 574 [env:extra_2] build_flags = ${custom.debug_flags} ${custom.extra_flags} @@ -73,6 +75,10 @@ def test_real_config(tmpdir): config = ProjectConfig(tmpdir.join("platformio.ini").strpath) assert config + len(config.validate(["extra_2", "base"], silent=True)) == 1 + with pytest.raises(UnknownEnvNames): + config.validate(["non-existing-env"]) + # unknown section with pytest.raises(ConfigParser.NoSectionError): config.getraw("unknown_section", "unknown_option") @@ -100,6 +106,7 @@ def test_real_config(tmpdir): # has_option assert config.has_option("env:base", "monitor_speed") assert not config.has_option("custom", "monitor_speed") + assert not config.has_option("env:extra_1", "lib_install") # sysenv assert config.get("custom", "extra_flags") is None @@ -117,7 +124,7 @@ def test_real_config(tmpdir): assert config.get("env:extra_2", "upload_port") == "/dev/extra_2/port" # getraw - assert config.getraw("env:extra_1", "lib_deps") == "\nLib1\nLib2" + assert config.getraw("env:extra_1", "lib_deps") == "574" assert config.getraw("env:extra_1", "build_flags") == "-lc -lm -D DEBUG=1" # get @@ -141,8 +148,8 @@ def test_real_config(tmpdir): ] # yapf: disable assert config.items(env="extra_1") == [ ("build_flags", ["-lc -lm -D DEBUG=1", "-DSYSENVDEPS1 -DSYSENVDEPS2"]), + ("lib_deps", ["574"]), ("monitor_speed", "115200"), - ("lib_deps", ["Lib1", "Lib2"]), ("lib_ignore", ["LibIgnoreCustom"]), ("upload_port", "/dev/sysenv/port") ] # yapf: disable