diff options
| author |   Fangyin Hu <fangyinx.hu@intel.com> | 2017-07-14 04:27:20 -0700 |
|---|---|---|
| committer |   Peter Mikus <pmikus@cisco.com> | 2017-07-17 11:07:09 +0000 |
| commit | 14bdb6773a39d688d34fbe6f2d04d8db8f15e27a (patch) | |
| tree | 51cd22e07d705037c0d39e73c0f84d63d4950a19 | |
| parent | e11000c10e1e9c368eb72df9c5e086c91b25b7a4 (diff) | |
Fix the TLDK test tcpdump not found issue.
Add the PYBOT execute exit status code.
Change-Id: If0fc29c580177f1b187ec751c6708fc138838bed
Signed-off-by: Fangyin Hu <fangyinx.hu@intel.com>
(cherry picked from commit c76f8f80681c352b67fb714d65da25a5217c4ac8)
| -rwxr-xr-x | bootstrap-TLDK.sh | 12 | ||||
| -rw-r--r-- | resources/libraries/python/TLDK/UdpTest.py | 4 |
2 files changed, 14 insertions, 2 deletions
diff --git a/bootstrap-TLDK.sh b/bootstrap-TLDK.sh index 4678bf57a6..4f731cd527 100755 --- a/bootstrap-TLDK.sh +++ b/bootstrap-TLDK.sh @@ -17,6 +17,8 @@ set -x cat /etc/hostname cat /etc/hosts +ARCHIVE_ARTIFACTS=(log.html output.xml report.html) + SCRIPT_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )" export PYTHONPATH=${SCRIPT_DIR} @@ -199,3 +201,13 @@ PYTHONPATH=`pwd` pybot -L TRACE -W 150 \ --include vm_envAND3_node_single_link_topo \ --noncritical EXPECTED_FAILING \ tests/ + +RETURN_STATUS=$(echo $?) + +# Archive artifacts +mkdir archive +for i in ${ARCHIVE_ARTIFACTS[@]}; do + cp $( readlink -f ${i} | tr '\n' ' ' ) archive/ +done + +exit ${RETURN_STATUS} diff --git a/resources/libraries/python/TLDK/UdpTest.py b/resources/libraries/python/TLDK/UdpTest.py index adc8aa0ed0..0571323dcf 100644 --- a/resources/libraries/python/TLDK/UdpTest.py +++ b/resources/libraries/python/TLDK/UdpTest.py @@ -114,8 +114,8 @@ class UdpTest(object): """ ssh = SSH() ssh.connect(dut_node) - cmd = 'cd {0}; tcpdump -nnnn -vvv -r ./{2}/{1}_tx.pcap | ' \ - 'grep \'udp sum ok\' | wc -l' \ + cmd = 'cd {0}; sudo /usr/sbin/tcpdump -nnnn -vvv -r ./{2}/{1}_tx.pcap' \ + ' | grep \'udp sum ok\' | wc -l' \ .format(con.REMOTE_FW_DIR, file_prefix, con.TLDK_TESTCONFIG) (ret_code, stdout, _) = ssh.exec_command(cmd, timeout=100) |