apply reviews in testcode

Author: jx2lee

tests/catalog/test_base.py

@@ -20,14 +20,12 @@
 from pathlib import PosixPath
 
 import pytest
-from pytest_mock import MockFixture
 
-from pyiceberg.catalog import Catalog, _get_env_config, load_catalog
+from pyiceberg.catalog import Catalog, load_catalog
 from pyiceberg.catalog.memory import InMemoryCatalog
 from pyiceberg.io import WAREHOUSE
 from pyiceberg.schema import Schema
 from pyiceberg.types import NestedField, StringType
-from pyiceberg.utils.config import Config
 
 
 @pytest.fixture
@@ -65,20 +63,6 @@ def test_load_catalog_has_type_and_impl() -> None:
     )
 
 
-def test_get_env_config_is_lazy_and_cached(mocker: MockFixture) -> None:
-    original_config = _get_env_config()
-    _get_env_config.cache_clear()
-    config = Config({"catalog": {"test": {"type": "in-memory"}}})
-    load_mock = mocker.patch("pyiceberg.catalog.Config.load", return_value=config)
-    assert _get_env_config() is config
-    assert _get_env_config() is config
-    load_mock.assert_called_once()
-
-    _get_env_config.cache_clear()
-    mocker.patch("pyiceberg.catalog.Config.load", return_value=original_config)
-    assert _get_env_config() is original_config
-
-
 def test_catalog_repr(catalog: InMemoryCatalog) -> None:
     s = repr(catalog)
     assert s == "test.in_memory.catalog (<class 'pyiceberg.catalog.memory.InMemoryCatalog'>)"

tests/catalog/test_rest.py

@@ -1893,7 +1893,7 @@ def test_catalog_from_environment_variables_override(rest_mock: Mocker) -> None:
         json={"defaults": {}, "overrides": {}},
         status_code=200,
     )
-    env_config: RecursiveDict = Config._from_environment_variables({})
+    env_config: RecursiveDict = Config.load().config
     mock_env_config = mock.Mock()
     mock_env_config.get_catalog_config.return_value = cast(RecursiveDict, env_config.get("catalog")).get("production")
     with mock.patch("pyiceberg.catalog._get_env_config", return_value=mock_env_config):

tests/utils/test_config.py

@@ -19,8 +19,10 @@
 from unittest import mock
 
 import pytest
+from pytest_mock import MockFixture
 from strictyaml import as_document
 
+from pyiceberg.catalog import _get_env_config
 from pyiceberg.typedef import UTF8, RecursiveDict
 from pyiceberg.utils.config import Config, _lowercase_dictionary_keys, merge_config
 
@@ -206,3 +208,17 @@ def test_load_reads_file_and_environment_once(monkeypatch: pytest.MonkeyPatch) -
 
     files_mock.assert_called_once()
     assert config.get_catalog_config("production") == {"type": "rest", "uri": "https://env.service.io/api"}
+
+
+def test_get_env_config_is_lazy_and_cached(mocker: MockFixture) -> None:
+    original_config = _get_env_config()
+    _get_env_config.cache_clear()
+    config = Config({"catalog": {"test": {"type": "in-memory"}}})
+    load_mock = mocker.patch("pyiceberg.catalog.Config.load", return_value=config)
+    assert _get_env_config() is config
+    assert _get_env_config() is config
+    load_mock.assert_called_once()
+
+    _get_env_config.cache_clear()
+    mocker.patch("pyiceberg.catalog.Config.load", return_value=original_config)
+    assert _get_env_config() is original_config