aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorChristian Ehrhardt <christian.ehrhardt@canonical.com>2016-08-12 12:49:25 +0200
committerChristian Ehrhardt <christian.ehrhardt@canonical.com>2016-08-12 12:53:18 +0200
commit12600e8bbf0b4795791954ab79ca4525b895a83d (patch)
treeb2d0cd5cfea7527b0503cf921c24dd10b9c5aa71
parent80b0014d491cc011d9d20012755c85f1b5fb39c9 (diff)
d/t/test-initscripts fix false positive in adt
Due to recent upgrades some commands of the reset function can fail if the service wasn't loaded before. But in that case no reset has to be done, so make it non fatal by adding a ||/bin/true Change-Id: I1da6bf315eefc9a4348c8dbae09d534a8fab9355 Signed-off-by: Christian Ehrhardt <christian.ehrhardt@canonical.com>
-rw-r--r--debian/tests/test-initscripts4
1 files changed, 2 insertions, 2 deletions
diff --git a/debian/tests/test-initscripts b/debian/tests/test-initscripts
index f465d6d6..069c57b8 100644
--- a/debian/tests/test-initscripts
+++ b/debian/tests/test-initscripts
@@ -88,8 +88,8 @@ resetservice() {
echo 3 > /proc/sys/vm/drop_caches
# stopping and resetting Service
- systemctl stop dpdk.service
- systemctl reset-failed dpdk.service
+ systemctl stop dpdk.service || /bin/true
+ systemctl reset-failed dpdk.service || /bin/true
echo "Unmounting all potential hugetlbfs mounts"
awk '/hugetlbfs/ {print $2}' /proc/mounts | while read hugetlbmount; do