From 132df89d77c5c7083016ebc1f35f03edd6a08efe Mon Sep 17 00:00:00 2001
From: xuweibj <xwbj@cn.ibm.com>
Date: Wed, 27 Mar 2019 22:20:02 -0400
Subject: [PATCH] stop conserver service in makeconservercf cases

---
 xCAT-test/autotest/testcase/makeconservercf/cases0 | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/xCAT-test/autotest/testcase/makeconservercf/cases0 b/xCAT-test/autotest/testcase/makeconservercf/cases0
index d1f2e20c1..22a98a26d 100644
--- a/xCAT-test/autotest/testcase/makeconservercf/cases0
+++ b/xCAT-test/autotest/testcase/makeconservercf/cases0
@@ -1,5 +1,5 @@
 start:makeconservercf_null
-label:others,ci_test
+label:others,conserver
 cmd:chdef -t node -o testnodetmp cons=hmc groups=all
 cmd:service goconserver stop
 cmd:#!/bin/bash
@@ -26,11 +26,12 @@ else
     exit $?
 fi
 check:rc==0
+cmd:service conserver stop
 cmd:rmdef -t node testnodetmp
 end
 
 start:makeconservercf_noderange
-label:others,ci_test
+label:others,conserver
 cmd:chdef -t node -o testnodetmp cons=hmc groups=all
 cmd:service goconserver stop
 cmd:#!/bin/bash
@@ -68,10 +69,11 @@ else
 fi
 check:rc==0
 cmd:rmdef -t node testnodetmp
+cmd:service conserver stop
 end
 
 start:makeconservercf_d
-label:others,ci_test
+label:others,conserver
 cmd:chdef -t node -o testnodetmp cons=hmc groups=all
 cmd:service goconserver stop
 cmd:#!/bin/bash
@@ -115,6 +117,7 @@ fi
 check:rc==0
 cmd:cat /etc/conserver.cf | grep testnodetmp
 check:output!~testnodetmp
+cmd:service conserver stop
 cmd:rmdef -t node testnodetmp
 end