Added tests for stub file, removed unnecessary branches

Author: shadowy-pycoder

pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "pyya"
-version = "0.1.12"
+version = "0.1.13"
 description = "Convert YAML/TOML configuration files to Python objects"
 readme = "README.md"
 requires-python = ">=3.8"

pyya.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: pyya
-Version: 0.1.12
+Version: 0.1.13
 Summary: Convert YAML/TOML configuration files to Python objects
 Author-email: shadowy-pycoder <[email protected]>
 Project-URL: Homepage, https://github.com/shadowy-pycoder/pyya

pyya.egg-info/SOURCES.txt

@@ -10,5 +10,6 @@ pyya.egg-info/dependency_links.txt
 pyya.egg-info/entry_points.txt
 pyya.egg-info/requires.txt
 pyya.egg-info/top_level.txt
+tests/test_common.py
 tests/test_toml.py
 tests/test_yaml.py

pyya/__init__.py

@@ -73,19 +73,13 @@ def _merge_configs(
                     # is it fine to proccess already poped dicts on recursion?
                     entry = _pop_ignored_keys(entry)
             if section not in _raw_data or _raw_data[section] is None:
-                if section not in _raw_data:
-                    _raw_data[section] = entry
-                    logger.debug(f'section `{".".join(sections)}` with value `{entry}` taken from {default_config}')
-                else:
-                    logger.debug(f'section `{".".join(sections)}` already exists in {config}, skipping')
+                _raw_data[section] = entry
+                logger.debug(f'section `{".".join(sections)}` with value `{entry}` taken from {default_config}')
             elif isinstance(entry, Dict):
                 _merge_configs(_raw_data[section], entry, sections)
             # TODO: add support for merging lists
             else:
-                if section not in _raw_data:
-                    _raw_data[section] = _raw_data.pop(section, None)
-                else:
-                    logger.debug(f'section `{".".join(sections)}` already exists in {config}, skipping')
+                logger.debug(f'section `{".".join(sections)}` already exists in {config}, skipping')
             sections.pop()
 
     def _sanitize_section(section: str) -> str:

tests/test_common.py

@@ -9,9 +9,9 @@
 default_config_path = Path(__file__).parent / 'testdata/default.config.yaml'
 config_wrong_ext = Path(__file__).parent / 'testdata/config.txt'
 config_corrupted = Path(__file__).parent / 'testdata/corrupted.yaml'
-
 config_extra = Path(__file__).parent / 'testdata/extra.yaml'
 default_config_extra = Path(__file__).parent / 'testdata/default_extra.yaml'
+config_stub = Path(__file__).parent / 'testdata/config.pyi'
 
 
 def test_raise_err_default_file_not_found() -> None:
@@ -85,3 +85,37 @@ def test_raise_err_extra_sections_access() -> None:
             default_config=default_config_extra,
         )
         _ = config.database.garbage
+
+
+def test_generate_stub() -> None:
+    assert not config_stub.exists()
+    _ = pyya.init_config(
+        config=config_stub,
+        default_config=default_config_path,
+        _generate_stub=True,  # this private argument is used by CLI tool
+    )
+    assert config_stub.exists()
+    config_stub.unlink()
+
+
+def test_generate_stub_exist() -> None:
+    _ = pyya.init_config(
+        config=config_stub,
+        default_config=default_config_path,
+        _generate_stub=True,
+    )
+    # NOTE: it would be better to use fixture here
+    try:
+        _ = pyya.init_config(
+            config=config_stub,
+            default_config=default_config_path,
+            _generate_stub=True,
+        )
+    except pyya.PyyaError:
+        pass
+    except Exception:
+        pytest.fail(reason='Wrong type of exception')
+    else:
+        pytest.fail(reason="Exception wasn't raised")
+    finally:
+        config_stub.unlink(missing_ok=True)

tests/testdata/default.config.yaml

@@ -57,3 +57,5 @@ environments:
       level: warn
     cache:
       ttl_seconds: 600
+
+flags: []