Merge pull request #16312 from foursixnine/tellmewhy

dzedro · web-flow · commit 78a1972a3ecc · 2023-01-31T09:33:18.000+01:00
Improve log collection for consolebase based tests and systemd enabled services
diff --git a/lib/Utils/Systemd.pm b/lib/Utils/Systemd.pm
@@ -60,7 +60,7 @@ sub systemctl {
     croak "systemctl(): no command specified" if ($command =~ /^ *$/);
     my $expect_false = $args{expect_false} ? '! ' : '';
     my @script_params = ("${expect_false}systemctl --no-pager $command", timeout => $args{timeout}, fail_message => $args{fail_message});
-    if ($command =~ /^(re)?start ([^ ]+)/) {
+    if ($command =~ /^(start|restart|enable) ([^ ]+)/) {
         my $unit_name = $2;
         $started_systemd_services{$unit_name} = 1;
     }

Original file line number	Diff line number	Diff line change
`@@ -60,7 +60,7 @@ sub systemctl {`
`60`	`60`	`croak "systemctl(): no command specified" if ($command =~ /^ *$/);`
`61`	`61`	`my $expect_false = $args{expect_false} ? '! ' : '';`
`62`	`62`	`my @script_params = ("${expect_false}systemctl --no-pager $command", timeout => $args{timeout}, fail_message => $args{fail_message});`
`63`		`- if ($command =~ /^(re)?start ([^ ]+)/) {`
	`63`	`+ if ($command =~ /^(start\|restart\|enable) ([^ ]+)/) {`
`64`	`64`	`my $unit_name = $2;`
`65`	`65`	`$started_systemd_services{$unit_name} = 1;`
`66`	`66`	`}`