Merge pull request #11418 from M0ses/fix_testing_for_210

Fix testing for 2.10
openSUSE · Jul 28, 2021 · 8417958 · 8417958
2 parents 91346b3 + 1863d22
commit 8417958
Showing 1 changed file with 7 additions and 3 deletions.
diff --git a/dist/t/0060-check_required_services.ts b/dist/t/0060-check_required_services.ts
@@ -34,8 +34,13 @@ my $version = `rpm -q --queryformat %{Version} obs-server`;
 my @enabled_daemons = @active_daemons;
 
 if ($version !~ /^2\.[89]\./) {
-  push @active_daemons, 'obs-clockwork.service', 'obs-delayedjob-queue-consistency_check.service', 'obs-delayedjob-queue-default.service', 'obs-delayedjob-queue-issuetracking.service', 'obs-delayedjob-queue-mailers.service', 'obs-delayedjob-queue-project_log_rotate.service', 'obs-delayedjob-queue-quick@0.service', 'obs-delayedjob-queue-quick@1.service', 'obs-delayedjob-queue-quick@2.service', 'obs-delayedjob-queue-releasetracking.service', 'obs-delayedjob-queue-staging.service', 'obs-delayedjob-queue-scm.service', 'obs-sphinx.service';
-  $tests = $tests + 13;
+  push @active_daemons, 'obs-clockwork.service', 'obs-delayedjob-queue-consistency_check.service', 'obs-delayedjob-queue-default.service', 'obs-delayedjob-queue-issuetracking.service', 'obs-delayedjob-queue-mailers.service', 'obs-delayedjob-queue-project_log_rotate.service', 'obs-delayedjob-queue-quick@0.service', 'obs-delayedjob-queue-quick@1.service', 'obs-delayedjob-queue-quick@2.service', 'obs-delayedjob-queue-releasetracking.service', 'obs-delayedjob-queue-staging.service', 'obs-sphinx.service';
+  $tests += 12;
+  my @out=`systemctl show --property=LoadError obs-delayedjob-queue-scm.service`;
+  if ($out[0] !~ /^LoadError=org.freedesktop.systemd1.NoSuchUnit/) {
+    push @active_daemons, 'obs-delayedjob-queue-scm.service';
+    $tests += 1;
+  }
 }
 
 plan tests => $tests;
@@ -57,7 +62,6 @@ while ($max_wait > 0) {
 	foreach my $srv (@active_daemons) {
 		my @state=`systemctl is-active $srv 2>/dev/null`;
 		chomp($state[0]);
-		print "$srv $state[0]\n";
 		if ( $state[0] eq 'active') {
 			$srv_state{$srv} = $state[0];
 		} elsif ( $state[0] eq 'failed') {