mirror of
https://github.com/saltstack/salt.git
synced 2025-04-16 09:40:20 +00:00
Remove commented out code
This commit is contained in:
parent
9c353984d7
commit
320641ca3c
1 changed files with 0 additions and 14 deletions
|
@ -6,20 +6,6 @@ def test_grains_overwrite(salt_cli, salt_master, salt_minion):
|
|||
# Force a grains sync
|
||||
salt_cli.run("saltutil.sync_grains", minion_tgt=salt_minion.id)
|
||||
|
||||
# XXX: This should no longer be neede because of using salt_cli.run.
|
||||
# To avoid a race condition on Windows, we need to make sure the
|
||||
# `test_custom_grain2.py` file is present in the _grains directory
|
||||
# before trying to get the grains. This test may execute before the
|
||||
# minion has finished syncing down the files it needs.
|
||||
# module = os.path.join(
|
||||
# salt_minion.config["cachedir"],
|
||||
# "files",
|
||||
# "base",
|
||||
# "_grains",
|
||||
# "custom_grain2.py",
|
||||
# )
|
||||
# assert os.path.exists(module)
|
||||
|
||||
# Check that custom grains are overwritten
|
||||
ret = salt_cli.run("grains.items", minion_tgt=salt_minion.id)
|
||||
assert ret.data["a_custom"] == {"k2": "v2"}
|
||||
|
|
Loading…
Add table
Reference in a new issue