[dts] optimize multi_process testscript to fix some bugs

[Liu, Yong]

Haifeng, please remove those useless codes prefixed with "#".

> -----Original Message-----
> From: dts [mailto:dts-bounces at dpdk.org] On Behalf Of Haifeng Tang
> Sent: Tuesday, July 07, 2015 2:13 PM
> To: dts at dpdk.org
> Subject: [dts] optimize multi_process testscript to fix some bugs
> 
> From: TangHaifeng <haifengx.tang at intel.com>
> 
> 
> Signed-off-by: TangHaifeng <haifengx.tang at intel.com>
> ---
>  tests/TestSuite_multiprocess.py |   53 +++++++++++++++++++++-------------
> ----
>  1 files changed, 29 insertions(+), 24 deletions(-)
> 
> diff --git a/tests/TestSuite_multiprocess.py
> b/tests/TestSuite_multiprocess.py
> index 4ef5313..3a37884 100644
> --- a/tests/TestSuite_multiprocess.py
> +++ b/tests/TestSuite_multiprocess.py
> @@ -37,7 +37,7 @@ Multi-process Test.
>  import dts
>  import time
>  from etgen import IxiaPacketGenerator
> -
> +import pdb
>  executions = []
>  from test_case import TestCase
> 
> @@ -68,6 +68,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 +80,32 @@ class TestMultiprocess(TestCase, IxiaPacketGenerator):
>          """
>          Basic operation.
>          """
> -
> +        #self.dut.alt_session.send_expect("cd dpdk","# ",5)
>          # Send message from secondary to primary
> -
> self.dut.send_expect("./examples/multi_process/simple_mp/simple_mp/%s/simp
> le_mp -n 1 -c 3 --proc-type=primary > out &" % self.target, "# ", 10)
> +
> #self.dut.send_expect("./examples/multi_process/simple_mp/simple_mp/%s/sim
> ple_mp -n 1 -c 3 --proc-type=primary > out &" % self.target, "# ", 10)
> +
> self.dut.alt_session.send_expect("./examples/multi_process/simple_mp/simpl
> e_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/simp
> le_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/simp
> le_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.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")
> -
> +        self.dut.kill_all()
>          # Send message from primary to secondary
> -
> self.dut.send_expect("./examples/multi_process/simple_mp/simple_mp/%s/simp
> le_mp -n 1 -c 3 --proc-type=primary &" % self.target, "# ", 10)
> +
> #self.dut.send_expect("./examples/multi_process/simple_mp/simple_mp/%s/sim
> ple_mp -n 1 -c 3 --proc-type=primary & " % self.target, "# ", 10)
> +
> self.dut.alt_session.send_expect("./examples/multi_process/simple_mp/simpl
> e_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/simp
> le_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/sim
> ple_mp -n 1 -c C --proc-type=secondary > out &" % self.target, "Finished
> Process Init", 10)
> +
> self.dut.send_expect("./examples/multi_process/simple_mp/simple_mp/%s/simp
> le_mp -n 1 -c C --proc-type=secondary | tee out  " % self.target,
> "Finished Process Init", 10)
> +        #elf.dut.send_expect("fg 1", "simple_mp")
> +        self.dut.alt_session.send_expect("send hello_secondary", ">")
> +        self.dut.alt_session.send_expect("quit", "# ")
> +        #self.dut.send_expect("fg 2", "simple_mp")
>          self.dut.send_expect("quit", "# ")
>          out = self.dut.send_expect("cat out", "# ")
> 
> @@ -138,7 +143,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/simp
> le_mp -n 1 -c 3 --proc-type=auto > out &" % self.target, "# ", 30)
> +
> self.dut.alt_session.send_expect("./examples/multi_process/simple_mp/simpl
> e_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/simp
> le_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 +151,21 @@ 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.send_expect("fg", "simple_mp")
> +        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/simp
> le_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/simpl
> e_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/simp
> le_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/simp
> le_mp -n 1 -c C --proc-type=auto |tee out_secondary " % self.target,
> "Finished Process Init", 30)
> +        #self.dut.send_expect("fg 1", "simple_mp")
> +        self.dut.alt_session.send_expect("send hello_secondary", ">",100)
> +        self.dut.alt_session.send_expect("quit", "# ")
> +        #self.dut.send_expect("fg 2", "simple_mp")
>          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