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

Unit test fix and artifact name correction

Browse source
This commit is contained in:
Daniel A. Wozniak 2025-01-08 03:50:41 -07:00 • committed by Daniel Wozniak
parent 718654ae21
commit faecc6d48c
2 changed files with 43 additions and 37 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
.github/workflows/test-action.yml vendored
View file

@ -332,7 +332,7 @@ jobs:
if: always() && steps.download-artifacts-from-vm.outcome == 'success'
uses: actions/upload-artifact@v4
with:
name: testrun-junit-artifacts-${{ matrix.slug }}-${{ inputs.nox-session }}-${{ matrix.transport }}-${{ matrix.tests-chunk }}-${{ env.TIMESTAMP }}
name: testrun-junit-artifacts-${{ matrix.slug }}-${{ inputs.nox-session }}-${{ matrix.transport }}${{ matrix.fips && '(fips)' || '' }}-${{ matrix.tests-chunk }}-${{ env.TIMESTAMP }}
path: |
artifacts/xml-unittests-output/
include-hidden-files: true

78
tests/unit/utils/test_systemd.py
View file

@ -173,18 +173,20 @@ class SystemdTestCase(TestCase):
# return data, so it is sufficient enough to mock it as True for
# these tests.
with patch("os.stat", side_effect=_booted_effect):
# Test without context dict passed
self.assertEqual(_systemd.has_scope(), _expected)
# Test that context key is set when context dict is passed
context = {}
self.assertEqual(_systemd.has_scope(context), _expected)
self.assertEqual(
context,
{
"salt.utils.systemd.booted": True,
"salt.utils.systemd.version": _version,
},
)
with patch("salt.utils.systemd.status", return_value=True):
# Test without context dict passed
self.assertEqual(_systemd.has_scope(), _expected)
context = {"salt.utils.systemd.status": True}
# Test that context key is set when context dict is passed
self.assertEqual(_systemd.has_scope(context), _expected)
self.assertEqual(
context,
{
"salt.utils.systemd.booted": True,
"salt.utils.systemd.status": True,
"salt.utils.systemd.version": _version,
},
)
def test_has_scope_systemd205(self):
"""
@ -207,18 +209,20 @@ class SystemdTestCase(TestCase):
# return data, so it is sufficient enough to mock it as True for
# these tests.
with patch("os.stat", side_effect=_booted_effect):
# Test without context dict passed
self.assertEqual(_systemd.has_scope(), _expected)
# Test that context key is set when context dict is passed
context = {}
self.assertEqual(_systemd.has_scope(context), _expected)
self.assertEqual(
context,
{
"salt.utils.systemd.booted": True,
"salt.utils.systemd.version": _version,
},
)
with patch("salt.utils.systemd.status", return_value=True):
# Test without context dict passed
self.assertEqual(_systemd.has_scope(), _expected)
# Test that context key is set when context dict is passed
context = {"salt.utils.systemd.status": True}
self.assertEqual(_systemd.has_scope(context), _expected)
self.assertEqual(
context,
{
"salt.utils.systemd.booted": True,
"salt.utils.systemd.version": _version,
"salt.utils.systemd.status": True,
},
)
def test_has_scope_systemd206(self):
"""
@ -241,18 +245,20 @@ class SystemdTestCase(TestCase):
# return data, so it is sufficient enough to mock it as True for
# these tests.
with patch("os.stat", side_effect=_booted_effect):
# Test without context dict passed
self.assertEqual(_systemd.has_scope(), _expected)
# Test that context key is set when context dict is passed
context = {}
self.assertEqual(_systemd.has_scope(context), _expected)
self.assertEqual(
context,
{
"salt.utils.systemd.booted": True,
"salt.utils.systemd.version": _version,
},
)
with patch("salt.utils.systemd.status", return_value=True):
# Test without context dict passed
self.assertEqual(_systemd.has_scope(), _expected)
# Test that context key is set when context dict is passed
context = {"salt.utils.systemd.status": True}
self.assertEqual(_systemd.has_scope(context), _expected)
self.assertEqual(
context,
{
"salt.utils.systemd.booted": True,
"salt.utils.systemd.version": _version,
"salt.utils.systemd.status": True,
},
)
def test_has_scope_no_systemd(self):
"""