Skip to content
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

Jump to bottom

DO NOT MERGE #2065

Closed
wants to merge 2 commits into from
Closed

DO NOT MERGE #2065

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
50ce2c6
DO NOT MERGE
jan-cerny Dec 15, 2023
830f301
Add a opposite definition
jan-cerny Dec 18, 2023
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
1 change: 0 additions & 1 deletion README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
# OpenSCAP

[![Gating](https://github.com/OpenSCAP/openscap/actions/workflows/build.yml/badge.svg?branch=maint-1.3)](https://github.com/OpenSCAP/openscap/actions/workflows/build.yml)
[![Build status](https://ci.appveyor.com/api/projects/status/3o5fnld1m98bo0so/branch/maint-1.3?svg=true)](https://ci.appveyor.com/project/OpenSCAP/openscap)
Expand Down
2 changes: 1 addition & 1 deletion tests/probes/systemdunitproperty/test_probes_systemdunitproperty.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ function test_probes_systemdunitproperty {

[ -f $RF ] && rm -f $RF

$OSCAP oval eval --results $RF $DF 2>$stderr
$OSCAP oval eval --results $RF $DF

[ -f $RF ]
verify_results "def" $DF $RF 8
Expand Down
11 changes: 11 additions & 0 deletions tests/probes/systemdunitproperty/test_probes_systemdunitproperty.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,6 +46,12 @@
<criterion test_ref="oval:0:tst:5"/>
</criteria>
</definition>
<definition class="compliance" version="1" id="oval:0:def:55"> <!-- comment="false" -->
<metadata><title></title><description></description></metadata>
<criteria>
<criterion test_ref="oval:0:tst:55"/>
</criteria>
</definition>

<definition class="compliance" version="1" id="oval:0:def:6"> <!-- comment="false" -->
<metadata><title></title><description></description></metadata>
Expand Down Expand Up @@ -99,6 +105,11 @@
<object object_ref="oval:0:obj:5"/>
</systemdunitproperty_test>

<!-- check that there doesn't exist systemd-journald.service unit with valid Conflicts property -->
<systemdunitproperty_test id="oval:0:tst:55" check="all" check_existence="none_exist" xmlns="http://oval.mitre.org/XMLSchema/oval-definitions-5#linux" comment="true" version="1">
<object object_ref="oval:0:obj:5"/>
</systemdunitproperty_test>

<!-- check if there is at least one systemd-journald.service unit it has value of Conflicts property equal to empty string -->
<systemdunitproperty_test id="oval:0:tst:6" check="all" check_existence="at_least_one_exists" xmlns="http://oval.mitre.org/XMLSchema/oval-definitions-5#linux" comment="false" version="1">
<object object_ref="oval:0:obj:5"/>
Expand Down