system/systemd
system/systemd
1
0
Fork 0
mirror of https://github.com/systemd/systemd synced 2024-07-09 12:36:12 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #33157 from DaanDeMeyer/end

Browse Source 
test: Run end.sh when running integration tests with mkosi
This commit is contained in:
Daan De Meyer 2024-06-02 21:04:56 +02:00 committed by GitHub
commit 9619fdc102
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
7 changed files with 9 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/shared/varlink-io.systemd.Hostname.c
View File

@ -30,7 +30,8 @@ static VARLINK_DEFINE_METHOD(
VARLINK_DEFINE_OUTPUT(FirmwareDate, VARLINK_INT, VARLINK_NULLABLE),
VARLINK_DEFINE_OUTPUT(MachineID, VARLINK_STRING, 0),
VARLINK_DEFINE_OUTPUT(BootID, VARLINK_STRING, 0),
VARLINK_DEFINE_OUTPUT(ProductUUID, VARLINK_STRING, VARLINK_NULLABLE));
VARLINK_DEFINE_OUTPUT(ProductUUID, VARLINK_STRING, VARLINK_NULLABLE),
VARLINK_DEFINE_OUTPUT(VSockCID, VARLINK_INT, VARLINK_NULLABLE));
VARLINK_DEFINE_INTERFACE(
io_systemd_Hostname,

3
src/shared/varlink-io.systemd.PCRLock.c
View File

@ -3,7 +3,8 @@
#include "varlink-io.systemd.PCRLock.h"
static VARLINK_DEFINE_METHOD(
ReadEventLog);
ReadEventLog,
VARLINK_DEFINE_OUTPUT(record, VARLINK_OBJECT, 0));
static VARLINK_DEFINE_METHOD(
MakePolicy,

2
src/shared/varlink-io.systemd.Resolve.c
View File

@ -129,7 +129,7 @@ static VARLINK_DEFINE_METHOD(
static VARLINK_DEFINE_STRUCT_TYPE(
ResolvedRecord,
VARLINK_DEFINE_FIELD(ifindex, VARLINK_INT, 0),
VARLINK_DEFINE_FIELD(ifindex, VARLINK_INT, VARLINK_NULLABLE),
VARLINK_DEFINE_FIELD_BY_TYPE(rr, ResourceRecord, VARLINK_NULLABLE),
VARLINK_DEFINE_FIELD(raw, VARLINK_STRING, 0));

6
test/TEST-16-EXTEND-TIMEOUT/TEST-16-EXTEND-TIMEOUT.service
View File

@ -18,7 +18,5 @@ StopWhenUnneeded=yes
[Service]
ExecStartPre=rm -f /failed /testok
Type=exec
TimeoutStartSec=infinity
ExecStartPre=/usr/lib/systemd/tests/testdata/units/%N.sh
ExecStart=true
Type=oneshot
ExecStart=/usr/lib/systemd/tests/testdata/units/%N.sh

1
test/integration-test-wrapper.py
View File

@ -71,6 +71,7 @@ def main():
[Service]
StandardOutput=journal+console
ExecStart=/usr/lib/systemd/tests/testdata/units/end.sh
"""
)

1
test/units/end.service
View File

@ -3,6 +3,7 @@
Description=End the test
After=testsuite.target
OnFailure=poweroff.target
OnSuccess=poweroff.target
OnFailureJobMode=replace-irreversibly
[Service]

1
test/units/end.sh
View File

@ -13,5 +13,4 @@ set -o pipefail
(! journalctl -q -o short-monotonic --grep "[F]ailed to parse serialized line" >>/failed)
(! journalctl -q -o short-monotonic --grep "[F]ailed to (de)?serialize \w+" >>/failed)
systemctl poweroff --no-block
exit 0