mirror of
https://github.com/saltstack/salt.git
synced 2025-04-10 23:01:39 +00:00
Use Sudo instead of Everything
This commit is contained in:
parent
ca81605ce6
commit
a5594e7bd2
2 changed files with 14 additions and 18 deletions
|
@ -110,10 +110,10 @@ def vim(chocolatey_mod):
|
|||
|
||||
|
||||
@pytest.fixture(scope="function")
|
||||
def everything(chocolatey_mod):
|
||||
chocolatey_mod.install(name="everything", version="1.4.1935")
|
||||
def sudo(chocolatey_mod):
|
||||
chocolatey_mod.install(name="sudo", version="1.1.2")
|
||||
yield
|
||||
chocolatey_mod.uninstall(name="everything", force=True)
|
||||
chocolatey_mod.uninstall(name="sudo", force=True)
|
||||
|
||||
|
||||
def test_installed_latest(clean, chocolatey, chocolatey_mod):
|
||||
|
@ -129,12 +129,10 @@ def test_installed_version(clean, chocolatey, chocolatey_mod):
|
|||
assert result["vim"]["installed"][0] == "9.0.1672"
|
||||
|
||||
|
||||
@pytest.mark.skipif(True, reason="Timing out, skipping for now")
|
||||
def test_installed_version_existing_capitalization(
|
||||
everything, chocolatey, chocolatey_mod
|
||||
):
|
||||
result = chocolatey.installed(name="everything", version="1.4.11024")
|
||||
expected_changes = {"Everything": {"new": ["1.4.11024"], "old": ["1.4.1935"]}}
|
||||
# @pytest.mark.skipif(True, reason="Timing out, skipping for now")
|
||||
def test_installed_version_existing_capitalization(sudo, chocolatey, chocolatey_mod):
|
||||
result = chocolatey.installed(name="sudo", version="1.1.3")
|
||||
expected_changes = {"Sudo": {"new": ["1.1.3"], "old": ["1.1.2"]}}
|
||||
assert result["changes"] == expected_changes
|
||||
|
||||
|
||||
|
|
|
@ -110,10 +110,10 @@ def vim(chocolatey_mod):
|
|||
|
||||
|
||||
@pytest.fixture(scope="function")
|
||||
def everything(chocolatey_mod):
|
||||
chocolatey_mod.install(name="everything", version="1.4.11024")
|
||||
def sudo(chocolatey_mod):
|
||||
chocolatey_mod.install(name="sudo", version="1.1.2")
|
||||
yield
|
||||
chocolatey_mod.uninstall(name="everything", force=True)
|
||||
chocolatey_mod.uninstall(name="sudo", force=True)
|
||||
|
||||
|
||||
def test_installed_latest(clean, chocolatey, chocolatey_mod):
|
||||
|
@ -129,12 +129,10 @@ def test_installed_version(clean, chocolatey, chocolatey_mod):
|
|||
assert result["vim"]["installed"][0] == "9.0.1672"
|
||||
|
||||
|
||||
@pytest.mark.skipif(True, reason="Timing out, skipping for now")
|
||||
def test_installed_version_existing_capitalization(
|
||||
everything, chocolatey, chocolatey_mod
|
||||
):
|
||||
result = chocolatey.installed(name="everything", version="1.4.11026")
|
||||
expected_changes = {"Everything": {"new": ["1.4.11026"], "old": ["1.4.11024"]}}
|
||||
# @pytest.mark.skipif(True, reason="Timing out, skipping for now")
|
||||
def test_installed_version_existing_capitalization(sudo, chocolatey, chocolatey_mod):
|
||||
result = chocolatey.installed(name="sudo", version="1.1.3")
|
||||
expected_changes = {"Sudo": {"new": ["1.1.3"], "old": ["1.1.2"]}}
|
||||
assert result["changes"] == expected_changes
|
||||
|
||||
|
||||
|
|
Loading…
Add table
Reference in a new issue