Hi! On 08/01/2014 05:23 PM, Alexey Kodanev wrote: > Hi Zeng! > On 08/01/2014 07:11 AM, Zeng Linggang wrote: >> * Move do_setup and do_cleanup into ftp_setup. >> >> * Delete ftp02_s1 and add do_test function for it. >> >> * Delete ftp_set_passwd and ftp_setup_vsftp_conf, since they are not >> be used. >> >> * Use test.sh instead of net_cmdlib.sh >> >> * Abandon trap and use tst_exit. >> >> * Make the test like: >> (set TCID TST_TOTAL ...) >> setup >> do_test >> check_result >> tst_exit >> >> * Some cleanup. >> >> Signed-off-by: Zeng Linggang <zenglg...@cn.fujitsu.com> >> --- >> testcases/network/tcp_cmds/ftp/ftp02 | 99 +++++++----- >> testcases/network/tcp_cmds/ftp/ftp02_s1 | 71 --------- >> testcases/network/tcp_cmds/ftp/ftp03 | 175 >> +++++++-------------- >> testcases/network/tcp_cmds/ftp/ftp04 | 109 ++++++------- >> testcases/network/tcp_cmds/ftp/ftp05 | 146 >> ++++++++--------- >> testcases/network/tcp_cmds/ftp/ftp_set_passwd | 28 ---- >> testcases/network/tcp_cmds/ftp/ftp_setup | 73 +++++++++ >> .../network/tcp_cmds/ftp/ftp_setup_vsftp_conf | 5 - >> 8 files changed, 304 insertions(+), 402 deletions(-) >> delete mode 100755 testcases/network/tcp_cmds/ftp/ftp02_s1 >> delete mode 100755 testcases/network/tcp_cmds/ftp/ftp_set_passwd >> create mode 100644 testcases/network/tcp_cmds/ftp/ftp_setup >> delete mode 100755 testcases/network/tcp_cmds/ftp/ftp_setup_vsftp_conf >> ... >> -#----------------------------------------------------------------------- >> -# FUNCTION: do_cleanup >> -#----------------------------------------------------------------------- >> >> +TCID="$0" > > May be we should just change it to ftp02, otherwise test name will > depend on how you running it (e.g. running by full path, TCID becomes > "/opt/ltp/testcases/bin/test_name". >
Pushed both patches, also changed TCID names. Thanks. > Are you running these tests from runEALtests.sh? > > Can we add them to networktests.sh, to "TCP/IP command tests" group as > it already has ftp01? > > Thanks, > Alexey > ------------------------------------------------------------------------------ Meet PCI DSS 3.0 Compliance Requirements with EventLog Analyzer Achieve PCI DSS 3.0 Compliant Status with Out-of-the-box PCI DSS Reports Are you Audit-Ready for PCI DSS 3.0 Compliance? Download White paper Comply to PCI DSS 3.0 Requirement 10 and 11.5 with EventLog Analyzer http://pubads.g.doubleclick.net/gampad/clk?id=154622311&iu=/4140/ostg.clktrk _______________________________________________ Ltp-list mailing list Ltp-list@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/ltp-list