feedc0de/platformio-core
1
0
Fork 0
forked from platformio/platformio-core
Code Pull Requests Activity

Typo fix

Browse Source
This commit is contained in:
Ivan Kravets
2019-06-01 15:38:55 +03:00
parent c038074489
commit 6186b425d4
2 changed files with 10 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
platformio/project/config.py
View File

@ -278,7 +278,7 @@ class ProjectConfig(object):
for name in option.oldnames}) for name in option.oldnames})
for section in self._parser.sections(): for section in self._parser.sections():
if not section.startswith("env:") or section != "platformio": if not section.startswith("env:") and section != "platformio":
continue continue
for option in self._parser.options(section): for option in self._parser.options(section):
# obsolete # obsolete

11
tests/test_projectconf.py
View File

@ -16,6 +16,7 @@ import os
import pytest import pytest
from platformio.exception import UnknownEnvNames
from platformio.project.config import ConfigParser, ProjectConfig from platformio.project.config import ConfigParser, ProjectConfig
BASE_CONFIG = """ BASE_CONFIG = """
@ -46,6 +47,7 @@ build_flags = ${custom.debug_flags} ${custom.extra_flags}
EXTRA_ENVS_CONFIG = """ EXTRA_ENVS_CONFIG = """
[env:extra_1] [env:extra_1]
build_flags = ${custom.lib_flags} ${custom.debug_flags} build_flags = ${custom.lib_flags} ${custom.debug_flags}
lib_install = 574
[env:extra_2] [env:extra_2]
build_flags = ${custom.debug_flags} ${custom.extra_flags} build_flags = ${custom.debug_flags} ${custom.extra_flags}
@ -73,6 +75,10 @@ def test_real_config(tmpdir):
config = ProjectConfig(tmpdir.join("platformio.ini").strpath) config = ProjectConfig(tmpdir.join("platformio.ini").strpath)
assert config assert config
len(config.validate(["extra_2", "base"], silent=True)) == 1
with pytest.raises(UnknownEnvNames):
config.validate(["non-existing-env"])
# unknown section # unknown section
with pytest.raises(ConfigParser.NoSectionError): with pytest.raises(ConfigParser.NoSectionError):
config.getraw("unknown_section", "unknown_option") config.getraw("unknown_section", "unknown_option")
@ -100,6 +106,7 @@ def test_real_config(tmpdir):
# has_option # has_option
assert config.has_option("env:base", "monitor_speed") assert config.has_option("env:base", "monitor_speed")
assert not config.has_option("custom", "monitor_speed") assert not config.has_option("custom", "monitor_speed")
assert not config.has_option("env:extra_1", "lib_install")
# sysenv # sysenv
assert config.get("custom", "extra_flags") is None 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" assert config.get("env:extra_2", "upload_port") == "/dev/extra_2/port"
# getraw # 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" assert config.getraw("env:extra_1", "build_flags") == "-lc -lm -D DEBUG=1"
# get # get
@ -141,8 +148,8 @@ def test_real_config(tmpdir):
] # yapf: disable ] # yapf: disable
assert config.items(env="extra_1") == [ assert config.items(env="extra_1") == [
("build_flags", ["-lc -lm -D DEBUG=1", "-DSYSENVDEPS1 -DSYSENVDEPS2"]), ("build_flags", ["-lc -lm -D DEBUG=1", "-DSYSENVDEPS1 -DSYSENVDEPS2"]),
("lib_deps", ["574"]),
("monitor_speed", "115200"), ("monitor_speed", "115200"),
("lib_deps", ["Lib1", "Lib2"]),
("lib_ignore", ["LibIgnoreCustom"]), ("lib_ignore", ["LibIgnoreCustom"]),
("upload_port", "/dev/sysenv/port") ("upload_port", "/dev/sysenv/port")
] # yapf: disable ] # yapf: disable