Skip to content

Do not apply a mark to a fixture #195

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
s-t-e-v-e-n-k wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Do not apply a mark to a fixture #195

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion tests/integration/factories/daemons/ssh/test_salt_ssh.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,6 @@


@pytest.fixture(scope="module")
@pytest.mark.skip_if_binaries_missing("sshd", "ssh-keygen")
def sshd(salt_factories):
# Set StrictModes to no because our config directory lives in /tmp and those permissions
# are not acceptable by sshd strict paranoia.
Expand Down Expand Up @@ -54,6 +53,7 @@ def salt_ssh_cli(sshd, salt_factories, master):


@pytest.mark.skip_on_windows
@pytest.mark.skip_if_binaries_missing("ssh", "sshd", "ssh-keygen")
def test_salt_ssh(salt_ssh_cli):
ret = salt_ssh_cli.run("test.echo", "It Works!", minion_tgt="localhost")
assert ret.returncode == 0
Expand Down
2 changes: 1 addition & 1 deletion tests/integration/factories/daemons/sshd/test_sshd.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ def test_sshd(sshd):


@pytest.mark.skip_on_windows
@pytest.mark.skip_if_binaries_missing("ssh")
@pytest.mark.skip_if_binaries_missing("ssh", "sshd", "ssh-keygen")
def test_connect(sshd, known_hosts_file):
ssh = shutil.which("ssh")
assert ssh is not None
Expand Down