From mboxrd@z Thu Jan  1 00:00:00 1970
Return-Path: <wangmy@cn.fujitsu.com>
From: Wang Mingyu <wangmy@cn.fujitsu.com>
Date: Mon, 8 Oct 2018 23:43:27 -0700
Message-ID: <1539067407-93632-7-git-send-email-wangmy@cn.fujitsu.com>
In-Reply-To: <1539067407-93632-1-git-send-email-wangmy@cn.fujitsu.com>
References: <1539067407-93632-1-git-send-email-wangmy@cn.fujitsu.com>
MIME-Version: 1.0
Content-Type: text/plain
Subject: [Fuego] [PATCH] dovecot: fix test of logfile and ps.
List-Id: Mailing list for the Fuego test framework
	<fuego.lists.linuxfoundation.org>
List-Unsubscribe: <https://lists.linuxfoundation.org/mailman/options/fuego>,
	<mailto:fuego-request@lists.linuxfoundation.org?subject=unsubscribe>
List-Archive: <http://lists.linuxfoundation.org/pipermail/fuego/>
List-Post: <mailto:fuego@lists.linuxfoundation.org>
List-Help: <mailto:fuego-request@lists.linuxfoundation.org?subject=help>
List-Subscribe: <https://lists.linuxfoundation.org/mailman/listinfo/fuego>,
	<mailto:fuego-request@lists.linuxfoundation.org?subject=subscribe>
To: fuego@lists.linuxfoundation.org

Signed-off-by: Wang Mingyu <wangmy@cn.fujitsu.com>
---
 engine/tests/Functional.dovecot/tests/dovecot_logfile.sh | 8 ++++++--
 engine/tests/Functional.dovecot/tests/dovecot_ps.sh      | 4 ++--
 2 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/engine/tests/Functional.dovecot/tests/dovecot_logfile.sh b/engine/tests/Functional.dovecot/tests/dovecot_logfile.sh
index 7489103..89fc199 100644
--- a/engine/tests/Functional.dovecot/tests/dovecot_logfile.sh
+++ b/engine/tests/Functional.dovecot/tests/dovecot_logfile.sh
@@ -5,16 +5,18 @@
 
 
 test="logfile"
-service_name=""
 
 . "./fuego_board_function_lib.sh"
 
 set_init_manager
+logger_service=$(detect_logger_service)
 
 exec_service_on_target dovecot stop
 rm -f /var/log/mail.log
 
-exec_service_on_target $service_name restart
+exec_service_on_target $logger_service restart
+
+sleep 3
 
 if exec_service_on_target dovecot start
 then
@@ -24,6 +26,8 @@ else
     echo " -> $test: TEST-FAIL"
 fi
 
+sleep 3
+
 if tail /var/log/mail.log | grep "dovecot"
 then
     echo " -> $test: TEST-PASS"
diff --git a/engine/tests/Functional.dovecot/tests/dovecot_ps.sh b/engine/tests/Functional.dovecot/tests/dovecot_ps.sh
index 2c627bb..0585cf2 100644
--- a/engine/tests/Functional.dovecot/tests/dovecot_ps.sh
+++ b/engine/tests/Functional.dovecot/tests/dovecot_ps.sh
@@ -19,7 +19,7 @@ else
     exit
 fi
 
-if ps -N a | grep [d]ovecot
+if ps -N a | grep "[/]usr/sbin/dovecot"
 then
     echo " -> get the pid of dovecot."
 else
@@ -38,7 +38,7 @@ else
     exit
 fi
 
-if ps -N a | grep [d]ovecot
+if ps -N a | grep "[/]usr/sbin/dovecot"
 then
     echo " -> $test: TEST-FAIL"
 else
-- 
1.8.3.1