saltstack/salt
1
0
Fork 0
mirror of https://github.com/saltstack/salt.git synced 2025-04-17 10:10:20 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 4

Revert "Add tests for opts dunder"

Browse source 
This reverts commit 54372bd248.
This commit is contained in:
Pedro Algarvio 2024-04-15 16:24:38 +01:00
parent 466b26f101
commit ece16ca7ef
2 changed files with 0 additions and 50 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
salt/loader/dunder.py
View file

@ -8,7 +8,6 @@ loader_context = salt.loader.context.LoaderContext()
__file_client__ = loader_context.named_context("__file_client__", default=None)
__opts__ = loader_context.named_context("__opts__")
__context__ = loader_context.named_context("__context__")
__pillar__ = loader_context.named_context("__pillar__")
__grains__ = loader_context.named_context("__grains__")

49
tests/pytests/functional/loader/test_dunder.py
View file

@ -1,49 +0,0 @@
import pathlib
import salt.loader.context
import salt.loader.lazy
import salt.utils.files
import tests.support.helpers
def test_opts_dunder_opts_without_import(tempdir):
"""
Test __opts__ without being imported.
When a loaded module uses __opts__ but does not import it from
salt.loader.dunder the __opts__ object will be a dictionary.
"""
opts = {"optimization_order": [0, 1, 2]}
with salt.utils.files.fopen(pathlib.Path(tempdir.tempdir) / "mymod.py", "w") as fp:
fp.write(
tests.support.helpers.dedent(
"""
def mymethod():
return type(__opts__)
"""
)
)
loader = salt.loader.lazy.LazyLoader([tempdir.tempdir], opts)
assert loader["mymod.mymethod"]() == dict
def test_opts_dunder_opts_with_import(tempdir):
"""
Test __opts__ when imported.
When a loaded module uses __opts__ by importing it from
salt.loader.dunder the __opts__ object will be a NamedLoaderContext.
"""
opts = {"optimization_order": [0, 1, 2]}
with salt.utils.files.fopen(pathlib.Path(tempdir.tempdir) / "mymod.py", "w") as fp:
fp.write(
tests.support.helpers.dedent(
"""
from salt.loader.dunder import __opts__
def mymethod():
return type(__opts__)
"""
)
)
loader = salt.loader.lazy.LazyLoader([tempdir.tempdir], opts)
assert loader["mymod.mymethod"]() == salt.loader.context.NamedLoaderContext