Implement changes to fixtures

Author: JasonGrace2282

tests/conftest.py

@@ -5,7 +5,7 @@
 
 import pytest
 
-from manim import config, tempconfig
+import manim
 
 
 def pytest_addoption(parser):
@@ -45,6 +45,20 @@ def pytest_collection_modifyitems(config, items):
                 item.add_marker(slow_skip)
 
 
+@pytest.fixture
+def config():
+    saved = manim.config.copy()
+    # we need to return the actual config so that tests
+    # using tempconfig pass
+    yield manim.config
+    manim.config.update(saved)
+
+
+@pytest.fixture
+def dry_run(config):
+    config.dry_run = True
+
+
 @pytest.fixture(scope="session")
 def python_version():
     # use the same python executable as it is running currently
@@ -62,10 +76,10 @@ def reset_cfg_file():
 
 
 @pytest.fixture
-def using_opengl_renderer():
+def using_opengl_renderer(config):
     """Standard fixture for running with opengl that makes tests use a standard_config.cfg with a temp dir."""
-    with tempconfig({"renderer": "opengl"}):
-        yield
+    config.renderer = "opengl"
+    yield
     # as a special case needed to manually revert back to cairo
     # due to side effects of setting the renderer
     config.renderer = "cairo"

tests/test_scene_rendering/conftest.py

@@ -4,8 +4,6 @@
 
 import pytest
 
-from manim import config, tempconfig
-
 
 @pytest.fixture
 def manim_cfg_file():
@@ -18,50 +16,39 @@ def simple_scenes_path():
 
 
 @pytest.fixture
-def using_temp_config(tmpdir):
-    """Standard fixture that makes tests use a standard_config.cfg with a temp dir."""
-    with tempconfig(
-        config.digest_file(Path(__file__).parent.parent / "standard_config.cfg"),
-    ):
-        config.media_dir = tmpdir
-        yield
+def standard_config(config):
+    return config.digest_file(Path(__file__).parent.parent / "standard_config.cfg")
 
 
 @pytest.fixture
-def using_temp_opengl_config(tmpdir):
+def using_temp_config(tmpdir, standard_config):
     """Standard fixture that makes tests use a standard_config.cfg with a temp dir."""
-    with tempconfig(
-        config.digest_file(Path(__file__).parent.parent / "standard_config.cfg"),
-    ):
-        config.media_dir = tmpdir
-        config.renderer = "opengl"
-        yield
+    standard_config.media_dir = tmpdir
 
 
 @pytest.fixture
-def disabling_caching():
-    with tempconfig({"disable_caching": True}):
-        yield
+def using_temp_opengl_config(tmpdir, standard_config, using_opengl_renderer):
+    """Standard fixture that makes tests use a standard_config.cfg with a temp dir."""
+    standard_config.media_dir = tmpdir
 
 
 @pytest.fixture
-def infallible_scenes_path():
-    return Path(__file__).parent / "infallible_scenes.py"
+def disabling_caching(config):
+    config.disable_caching = True
 
 
 @pytest.fixture
-def use_opengl_renderer(enable_preview):
-    with tempconfig({"renderer": "opengl", "preview": enable_preview}):
-        yield
+def infallible_scenes_path():
+    return Path(__file__).parent / "infallible_scenes.py"
 
 
 @pytest.fixture
-def force_window_config_write_to_movie():
-    with tempconfig({"force_window": True, "write_to_movie": True}):
-        yield
+def force_window_config_write_to_movie(config):
+    config.force_window = True
+    config.write_to_movie = True
 
 
 @pytest.fixture
-def force_window_config_pngs():
-    with tempconfig({"force_window": True, "format": "png"}):
-        yield
+def force_window_config_pngs(config):
+    config.force_window = True
+    config.format = "png"