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 2

The paths need to be strings for Py3.5

Browse source
This commit is contained in:
Pedro Algarvio 2020-11-13 17:28:04 +00:00 • committed by Daniel Wozniak
parent 8a74985356
commit 237957c2ec
1 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
tests/pytests/unit/modules/test_tls.py
View file

@ -41,7 +41,7 @@ def test_create_ca_permissions_on_cert_and_key(tmpdir, tls_test_data):
with patch.dict(
tls.__salt__, {"config.option": mock_opt, "cmd.retcode": mock_ret}
), patch.dict(tls.__opts__, {"hash_type": "sha256", "cachedir": tmpdir}):
), patch.dict(tls.__opts__, {"hash_type": "sha256", "cachedir": str(tmpdir)}):
tls.create_ca(ca_name, days=365, fixmode=False, **tls_test_data["create_ca"])
certp_mode = os.stat(certp).st_mode & 0o7777
certk_mode = os.stat(certk).st_mode & 0o7777
@ -72,7 +72,7 @@ def test_create_csr_permissions_on_csr_and_key(tmpdir, tls_test_data):
with patch.dict(
tls.__salt__,
{"config.option": mock_opt, "cmd.retcode": mock_ret, "pillar.get": mock_pgt},
), patch.dict(tls.__opts__, {"hash_type": "sha256", "cachedir": tmpdir}):
), patch.dict(tls.__opts__, {"hash_type": "sha256", "cachedir": str(tmpdir)}):
tls.create_ca(ca_name, days=365, **tls_test_data["create_ca"])
tls.create_csr(ca_name, **tls_test_data["create_ca"])
@ -105,7 +105,7 @@ def test_create_self_signed_cert_permissions_on_csr_cert_and_key(tmpdir, tls_tes
with patch.dict(
tls.__salt__,
{"config.option": mock_opt, "cmd.retcode": mock_ret, "pillar.get": mock_pgt},
), patch.dict(tls.__opts__, {"hash_type": "sha256", "cachedir": tmpdir}):
), patch.dict(tls.__opts__, {"hash_type": "sha256", "cachedir": str(tmpdir)}):
tls.create_self_signed_cert(ca_name, days=365, **tls_test_data["create_ca"])
certp_mode = os.stat(certp).st_mode & 0o7777