From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mga03.intel.com (mga03.intel.com [134.134.136.65]) by dpdk.org (Postfix) with ESMTP id 0329FE72 for ; Wed, 8 Jul 2015 11:15:44 +0200 (CEST) Received: from fmsmga001.fm.intel.com ([10.253.24.23]) by orsmga103.jf.intel.com with ESMTP; 08 Jul 2015 02:15:43 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.15,430,1432623600"; d="scan'208";a="742839379" Received: from shvmail01.sh.intel.com ([10.239.29.42]) by fmsmga001.fm.intel.com with ESMTP; 08 Jul 2015 02:15:43 -0700 Received: from shecgisg003.sh.intel.com (shecgisg003.sh.intel.com [10.239.29.90]) by shvmail01.sh.intel.com with ESMTP id t689FfGJ005404; Wed, 8 Jul 2015 17:15:41 +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 t689FciX008533; Wed, 8 Jul 2015 17:15:40 +0800 Received: (from jingguox@localhost) by shecgisg003.sh.intel.com (8.13.6/8.13.6/Submit) id t689Fcn3008529; Wed, 8 Jul 2015 17:15:38 +0800 From: Haifeng Tang To: dts@dpdk.org Date: Wed, 8 Jul 2015 17:15:37 +0800 Message-Id: <1436346937-8498-1-git-send-email-haifengx.tang@intel.com> X-Mailer: git-send-email 1.7.4.1 Cc: jingguox.fu@intel.com Subject: [dts] [DTS][PATCH V2] fix multi_process bugs X-BeenThere: dts@dpdk.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: test suite reviews and discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 08 Jul 2015 09:15:45 -0000 From: TangHaifeng Signed-off-by: TangHaifeng --- tests/TestSuite_multiprocess.py | 39 +++++++++++++++------------------------ 1 files changed, 15 insertions(+), 24 deletions(-) diff --git a/tests/TestSuite_multiprocess.py b/tests/TestSuite_multiprocess.py index 4ef5313..a19967c 100644 --- a/tests/TestSuite_multiprocess.py +++ b/tests/TestSuite_multiprocess.py @@ -37,7 +37,6 @@ Multi-process Test. import dts import time from etgen import IxiaPacketGenerator - executions = [] from test_case import TestCase @@ -68,6 +67,7 @@ class TestMultiprocess(TestCase, IxiaPacketGenerator): executions.append({'nprocs': 4, 'cores': '1S/2C/2T', 'pps': 0}) executions.append({'nprocs': 4, 'cores': '1S/4C/1T', 'pps': 0}) executions.append({'nprocs': 8, 'cores': '1S/4C/2T', 'pps': 0}) + self.dut.alt_session.send_expect("cd dpdk","# ",5) def set_up(self): """ @@ -79,28 +79,22 @@ class TestMultiprocess(TestCase, IxiaPacketGenerator): """ Basic operation. """ - # Send message from secondary to primary - self.dut.send_expect("./examples/multi_process/simple_mp/simple_mp/%s/simple_mp -n 1 -c 3 --proc-type=primary > out &" % self.target, "# ", 10) + self.dut.alt_session.send_expect("./examples/multi_process/simple_mp/simple_mp/%s/simple_mp -n 1 -c 3 --proc-type=primary |tee out " % self.target, "Finished Process Init", 100) time.sleep(20) - self.dut.send_expect("./examples/multi_process/simple_mp/simple_mp/%s/simple_mp -n 1 -c C --proc-type=secondary" % self.target, "Finished Process Init", 10) + self.dut.send_expect("./examples/multi_process/simple_mp/simple_mp/%s/simple_mp -n 1 -c C --proc-type=secondary" % self.target, "Finished Process Init", 100) self.dut.send_expect("send hello_primary", ">") self.dut.send_expect("quit", "# ") - self.dut.send_expect("fg", "simple_mp") - self.dut.send_expect("quit", "# ") - out = self.dut.send_expect("cat out", "# ") - + self.dut.alt_session.send_expect("quit","# ") + out = self.dut.alt_session.send_expect("cat out","# ") self.verify("Received 'hello_primary'" in out, "Message not received on primary process") - # Send message from primary to secondary - self.dut.send_expect("./examples/multi_process/simple_mp/simple_mp/%s/simple_mp -n 1 -c 3 --proc-type=primary &" % self.target, "# ", 10) + self.dut.alt_session.send_expect("./examples/multi_process/simple_mp/simple_mp/%s/simple_mp -n 1 -c 3 --proc-type=primary " % self.target, "Finished Process Init", 10) time.sleep(20) - self.dut.send_expect("./examples/multi_process/simple_mp/simple_mp/%s/simple_mp -n 1 -c C --proc-type=secondary > out &" % self.target, "Finished Process Init", 10) - self.dut.send_expect("fg 1", "simple_mp") - self.dut.send_expect("send hello_secondary", ">") - self.dut.send_expect("quit", "# ") - self.dut.send_expect("fg 2", "simple_mp") + self.dut.send_expect("./examples/multi_process/simple_mp/simple_mp/%s/simple_mp -n 1 -c C --proc-type=secondary | tee out " % self.target, "Finished Process Init", 10) + self.dut.alt_session.send_expect("send hello_secondary", ">") + self.dut.alt_session.send_expect("quit", "# ") self.dut.send_expect("quit", "# ") out = self.dut.send_expect("cat out", "# ") @@ -138,7 +132,7 @@ class TestMultiprocess(TestCase, IxiaPacketGenerator): self.dut.kill_all() # Send message from secondary to primary (auto process type) - self.dut.send_expect("./examples/multi_process/simple_mp/simple_mp/%s/simple_mp -n 1 -c 3 --proc-type=auto > out &" % self.target, "# ", 30) + self.dut.alt_session.send_expect("./examples/multi_process/simple_mp/simple_mp/%s/simple_mp -n 1 -c 3 --proc-type=auto |tee out " % self.target, "Finished Process Init", 30) time.sleep(20) out = self.dut.send_expect("./examples/multi_process/simple_mp/simple_mp/%s/simple_mp -n 1 -c C --proc-type=auto" % self.target, "Finished Process Init", 30) self.verify("EAL: Auto-detected process type: SECONDARY" in out, @@ -146,21 +140,18 @@ class TestMultiprocess(TestCase, IxiaPacketGenerator): self.dut.send_expect("send hello_primary", ">") self.dut.send_expect("quit", "# ") - self.dut.send_expect("fg", "simple_mp") - self.dut.send_expect("quit", "# ") + self.dut.alt_session.send_expect("quit", "# ") out = self.dut.send_expect("cat out", "# ") self.verify("EAL: Auto-detected process type: PRIMARY" in out, "The type of process (PRIMARY) was not detected properly") self.verify("Received 'hello_primary'" in out, "Message not received on primary process") # Send message from primary to secondary (auto process type) - out = self.dut.send_expect("./examples/multi_process/simple_mp/simple_mp/%s/simple_mp -n 1 -c 3 --proc-type=auto > out_primary &" % self.target, "# ", 30) + out = self.dut.alt_session.send_expect("./examples/multi_process/simple_mp/simple_mp/%s/simple_mp -n 1 -c 3 --proc-type=auto |tee out_primary " % self.target, "Finished Process Init", 30) time.sleep(20) - self.dut.send_expect("./examples/multi_process/simple_mp/simple_mp/%s/simple_mp -n 1 -c C --proc-type=auto > out_secondary &" % self.target, "#", 30) - self.dut.send_expect("fg 1", "simple_mp") - self.dut.send_expect("send hello_secondary", ">") - self.dut.send_expect("quit", "# ") - self.dut.send_expect("fg 2", "simple_mp") + self.dut.send_expect("./examples/multi_process/simple_mp/simple_mp/%s/simple_mp -n 1 -c C --proc-type=auto |tee out_secondary " % self.target, "Finished Process Init", 30) + self.dut.alt_session.send_expect("send hello_secondary", ">",100) + self.dut.alt_session.send_expect("quit", "# ") self.dut.send_expect("quit", "# ") out = self.dut.send_expect("cat out_primary", "# ") self.verify("EAL: Auto-detected process type: PRIMARY" in out, "The type of process (PRIMARY) was not detected properly") -- 1.7.4.4