From 16585dbaf4f951b546b0b5f5055f87a7ac4ba44e Mon Sep 17 00:00:00 2001 From: Daan De Meyer Date: Mon, 13 May 2024 21:19:14 +0200 Subject: [PATCH 1/3] mkosi: Disable journald rate-limiting --- .../usr/lib/systemd/journald.conf.d/ratelimit.conf | 5 +++++ 1 file changed, 5 insertions(+) create mode 100644 mkosi.images/system/mkosi.extra/usr/lib/systemd/journald.conf.d/ratelimit.conf diff --git a/mkosi.images/system/mkosi.extra/usr/lib/systemd/journald.conf.d/ratelimit.conf b/mkosi.images/system/mkosi.extra/usr/lib/systemd/journald.conf.d/ratelimit.conf new file mode 100644 index 0000000000..3baede462e --- /dev/null +++ b/mkosi.images/system/mkosi.extra/usr/lib/systemd/journald.conf.d/ratelimit.conf @@ -0,0 +1,5 @@ +# SPDX-License-Identifier: LGPL-2.1-or-later + +[Journal] +RateLimitIntervalSec=0 +RateLimitBurst=0 From 15c1a7855ca2f6706582701ddf304b76dfd459bf Mon Sep 17 00:00:00 2001 From: Daan De Meyer Date: Tue, 14 May 2024 15:22:06 +0200 Subject: [PATCH 2/3] test: Allow using TEST_MATCH_TESTCASE with systemd-networkd-tests.py --- test/test-network/systemd-networkd-tests.py | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/test/test-network/systemd-networkd-tests.py b/test/test-network/systemd-networkd-tests.py index eb9a2ebdfc..6e7ce7cbd8 100755 --- a/test/test-network/systemd-networkd-tests.py +++ b/test/test-network/systemd-networkd-tests.py @@ -7805,5 +7805,11 @@ if __name__ == '__main__': if enable_debug: wait_online_env.update({'SYSTEMD_LOG_LEVEL': 'debug'}) - sys.argv[1:] = unknown_args - unittest.main(verbosity=3) + unittest.main( + verbosity=3, + argv=[ + sys.argv[0], + *unknown_args, + *(["-k", match] if (match := os.getenv("TEST_MATCH_TESTCASE")) else []) + ], + ) From aa09f3078f48f33c8e0d9c234c2593aad5eb5349 Mon Sep 17 00:00:00 2001 From: Daan De Meyer Date: Mon, 6 May 2024 15:23:24 +0200 Subject: [PATCH 3/3] test: Add TEST-85-NETWORK to run systemd-networkd-tests.py This adds a testsuite unit to run systemd-networkd-tests.py. This is mkosi only for now as python is not available in the images set up by the bash framework. We give the test a lower priority as it takes a while to run so we want to start it as soon as possible. --- test/TEST-85-NETWORK/Makefile | 6 +++++ test/TEST-85-NETWORK/meson.build | 42 ++++++++++++++++++++++++++++++++ test/meson.build | 1 + 3 files changed, 49 insertions(+) create mode 100644 test/TEST-85-NETWORK/Makefile create mode 100644 test/TEST-85-NETWORK/meson.build diff --git a/test/TEST-85-NETWORK/Makefile b/test/TEST-85-NETWORK/Makefile new file mode 100644 index 0000000000..653f16163f --- /dev/null +++ b/test/TEST-85-NETWORK/Makefile @@ -0,0 +1,6 @@ +# SPDX-License-Identifier: LGPL-2.1-or-later + +all setup run clean clean-again: + true + +.PHONY: all setup run clean clean-again diff --git a/test/TEST-85-NETWORK/meson.build b/test/TEST-85-NETWORK/meson.build new file mode 100644 index 0000000000..95b91f77df --- /dev/null +++ b/test/TEST-85-NETWORK/meson.build @@ -0,0 +1,42 @@ +# SPDX-License-Identifier: LGPL-2.1-or-later + +name = fs.name(meson.current_source_dir()) +unit = configure_file( + input : files('../test.service.in'), + output : '@0@.service'.format(name), + configuration : integration_test_template['configuration'] + { + 'command' : '@0@ --no-journal'.format(testdata_dir / 'test-network/systemd-networkd-tests.py') + }, +) + +foreach testcase : [ + 'NetworkctlTests', + 'NetworkdMatchTests', + 'WaitOnlineTests', + 'NetworkdNetDevTests', + 'NetworkdL2TPTests', + 'NetworkdNetworkTests', + 'NetworkdTCTests', + 'NetworkdStateFileTests', + 'NetworkdBondTests', + 'NetworkdBridgeTests', + 'NetworkdSRIOVTests', + 'NetworkdLLDPTests', + 'NetworkdRATests', + 'NetworkdDHCPServerTests', + 'NetworkdDHCPServerRelayAgentTests', + 'NetworkdDHCPClientTests', + 'NetworkdDHCPPDTests', + 'NetworkdIPv6PrefixTests', + 'NetworkdMTUTests', +] + integration_tests += [ + integration_test_template + { + 'name' : '@0@-@1@'.format(name, testcase), + 'unit' : unit, + 'cmdline' : integration_test_template['cmdline'] + [ + 'systemd.setenv=TEST_MATCH_TESTCASE=@0@'.format(testcase) + ], + }, + ] +endforeach diff --git a/test/meson.build b/test/meson.build index 60d42efee6..5a261008ea 100644 --- a/test/meson.build +++ b/test/meson.build @@ -370,6 +370,7 @@ foreach dirname : [ 'TEST-82-SOFTREBOOT', 'TEST-83-BTRFS', 'TEST-84-STORAGETM', + 'TEST-85-NETWORK', ] subdir(dirname) endforeach