richardphibel / rpms / systemd

Forked from rpms/systemd 2 years ago
Clone
9ab0c5
From 067cc9cc451ef4b98f451bf3a67c10660749ddd0 Mon Sep 17 00:00:00 2001
9ab0c5
From: David Tardon <dtardon@redhat.com>
9ab0c5
Date: Wed, 10 Jul 2019 09:48:51 +0200
9ab0c5
Subject: [PATCH] revert local changes made during backport of the test
9ab0c5
9ab0c5
(cherry picked from commit 225a458ec4c1bee97d0cee13895977614fd8cc16)
9ab0c5
9ab0c5
Related: #1729226
9ab0c5
---
9ab0c5
 test/TEST-20-MAINPIDGAMES/testsuite.sh | 6 ++----
9ab0c5
 1 file changed, 2 insertions(+), 4 deletions(-)
9ab0c5
9ab0c5
diff --git a/test/TEST-20-MAINPIDGAMES/testsuite.sh b/test/TEST-20-MAINPIDGAMES/testsuite.sh
9ab0c5
index d4ad63865c..8b0b664652 100755
9ab0c5
--- a/test/TEST-20-MAINPIDGAMES/testsuite.sh
9ab0c5
+++ b/test/TEST-20-MAINPIDGAMES/testsuite.sh
9ab0c5
@@ -175,12 +175,10 @@ ExecStart=/dev/shm/mainpid3.sh
9ab0c5
 EOF
9ab0c5
 
9ab0c5
 systemctl daemon-reload
9ab0c5
-systemctl start mainpidsh3.service
9ab0c5
+! systemctl start mainpidsh3.service
9ab0c5
 
9ab0c5
 # Test that this failed due to timeout, and not some other error
9ab0c5
-# test `systemctl_show_value -p Result mainpidsh3.service` = timeout
9ab0c5
-# Just check that there is no MainPID => the pid file was ignored
9ab0c5
-test `systemctl_show_value -p MainPID mainpidsh3.service` -eq 0
9ab0c5
+test `systemctl_show_value -p Result mainpidsh3.service` = timeout
9ab0c5
 
9ab0c5
 systemd-analyze set-log-level info
9ab0c5