From mboxrd@z Thu Jan  1 00:00:00 1970
Return-Path: <yliu84x@shecgisg003.sh.intel.com>
Received: from mga01.intel.com (mga01.intel.com [192.55.52.88])
 by dpdk.org (Postfix) with ESMTP id 06E895A99
 for <dts@dpdk.org>; Fri, 17 Jul 2015 11:31:51 +0200 (CEST)
Received: from orsmga001.jf.intel.com ([10.7.209.18])
 by fmsmga101.fm.intel.com with ESMTP; 17 Jul 2015 02:31:51 -0700
X-ExtLoop1: 1
X-IronPort-AV: E=Sophos;i="5.15,495,1432623600"; d="scan'208";a="730649071"
Received: from shvmail01.sh.intel.com ([10.239.29.42])
 by orsmga001.jf.intel.com with ESMTP; 17 Jul 2015 02:31:50 -0700
Received: from shecgisg003.sh.intel.com (shecgisg003.sh.intel.com
 [10.239.29.90])
 by shvmail01.sh.intel.com with ESMTP id t6H9Vmxs027698;
 Fri, 17 Jul 2015 17:31:48 +0800
Received: from shecgisg003.sh.intel.com (localhost [127.0.0.1])
 by shecgisg003.sh.intel.com (8.13.6/8.13.6/SuSE Linux 0.8) with ESMTP id
 t6H9Vkep032261; Fri, 17 Jul 2015 17:31:48 +0800
Received: (from yliu84x@localhost)
 by shecgisg003.sh.intel.com (8.13.6/8.13.6/Submit) id t6H9VkKY032257;
 Fri, 17 Jul 2015 17:31:46 +0800
From: Yong Liu <yong.liu@intel.com>
To: dts@dpdk.org
Date: Fri, 17 Jul 2015 17:31:45 +0800
Message-Id: <1437125505-32225-1-git-send-email-yong.liu@intel.com>
X-Mailer: git-send-email 1.7.4.1
Subject: [dts] [PATCH] Remove vhost socket file before start vxlan sample
X-BeenThere: dts@dpdk.org
X-Mailman-Version: 2.1.15
Precedence: list
List-Id: test suite reviews and discussions <dts.dpdk.org>
List-Unsubscribe: <http://dpdk.org/ml/options/dts>,
 <mailto:dts-request@dpdk.org?subject=unsubscribe>
List-Archive: <http://dpdk.org/ml/archives/dts/>
List-Post: <mailto:dts@dpdk.org>
List-Help: <mailto:dts-request@dpdk.org?subject=help>
List-Subscribe: <http://dpdk.org/ml/listinfo/dts>,
 <mailto:dts-request@dpdk.org?subject=subscribe>
X-List-Received-Date: Fri, 17 Jul 2015 09:31:52 -0000

From: Marvin Liu <yong.liu@intel.com>

Vxlan sample will remove socket file if exited normally. When something wrong
and vhost socket existed, vxlan sample will not start as normal.

Signed-off-by: Marvin Liu <yong.liu@intel.com>

diff --git a/tests/TestSuite_vxlan_sample.py b/tests/TestSuite_vxlan_sample.py
index ef94c87..4ede98e 100644
--- a/tests/TestSuite_vxlan_sample.py
+++ b/tests/TestSuite_vxlan_sample.py
@@ -196,6 +196,9 @@ class TestVxlanSample(TestCase):
         pass
 
     def prepare_vxlan_sample_env(self, tep_cmd, vm_num=1):
+        # remove unexpected socke
+        self.dut.send_expect("rm -rf vhost-net", "# ")
+
         # start tep_termination first
         self.dut.send_expect(tep_cmd, "VHOST_CONFIG: bind to vhost-net")
 
-- 
1.9.3