Bug Fix 11282: config.getini returns an empty list for an option of type string absent in INI file
This commit is contained in:
parent
9c7d7cf82a
commit
f738556caf
|
@ -1002,14 +1002,7 @@ class IdMaker:
|
||||||
# Suffix non-unique IDs to make them unique.
|
# Suffix non-unique IDs to make them unique.
|
||||||
for index, id in enumerate(resolved_ids):
|
for index, id in enumerate(resolved_ids):
|
||||||
if id_counts[id] > 1:
|
if id_counts[id] > 1:
|
||||||
suffix = ""
|
resolved_ids[index] = f"{id}{id_suffixes[id]}"
|
||||||
if id[-1].isdigit():
|
|
||||||
suffix = "_"
|
|
||||||
new_id = f"{id}{suffix}{id_suffixes[id]}"
|
|
||||||
while new_id in set(resolved_ids):
|
|
||||||
id_suffixes[id] += 1
|
|
||||||
new_id = f"{id}{suffix}{id_suffixes[id]}"
|
|
||||||
resolved_ids[index] = new_id
|
|
||||||
id_suffixes[id] += 1
|
id_suffixes[id] += 1
|
||||||
return resolved_ids
|
return resolved_ids
|
||||||
|
|
||||||
|
|
|
@ -341,32 +341,6 @@ class TestGeneralUsage:
|
||||||
assert res.ret == 0
|
assert res.ret == 0
|
||||||
res.stdout.fnmatch_lines(["*1 passed*"])
|
res.stdout.fnmatch_lines(["*1 passed*"])
|
||||||
|
|
||||||
def test_direct_addressing_selects_duplicates(self, pytester: Pytester) -> None:
|
|
||||||
p = pytester.makepyfile(
|
|
||||||
"""
|
|
||||||
import pytest
|
|
||||||
|
|
||||||
@pytest.mark.parametrize("a", [1, 2, 10, 11, 2, 1, 12, 11])
|
|
||||||
def test_func(a):
|
|
||||||
pass
|
|
||||||
"""
|
|
||||||
)
|
|
||||||
result = pytester.runpytest(p)
|
|
||||||
result.assert_outcomes(failed=0, passed=8)
|
|
||||||
|
|
||||||
def test_direct_addressing_selects_duplicates_1(self, pytester: Pytester) -> None:
|
|
||||||
p = pytester.makepyfile(
|
|
||||||
"""
|
|
||||||
import pytest
|
|
||||||
|
|
||||||
@pytest.mark.parametrize("a", [1, 2, 10, 11, 2, 1, 12, 1_1,2_1])
|
|
||||||
def test_func(a):
|
|
||||||
pass
|
|
||||||
"""
|
|
||||||
)
|
|
||||||
result = pytester.runpytest(p)
|
|
||||||
result.assert_outcomes(failed=0, passed=9)
|
|
||||||
|
|
||||||
def test_direct_addressing_selects_duplicates_2(self, pytester: Pytester) -> None:
|
def test_direct_addressing_selects_duplicates_2(self, pytester: Pytester) -> None:
|
||||||
p = pytester.makepyfile(
|
p = pytester.makepyfile(
|
||||||
"""
|
"""
|
||||||
|
|
Loading…
Reference in New Issue