[LTP] [PATCH] ftp/ftp02: The case needs to check vsftpd first

[LTP] [PATCH] ftp/ftp02: The case needs to check vsftpd first

[Cui Bixuan]

The ftp02 case will use vsftpd so we should check it first

Signed-off-by: Cui Bixuan <cuibixuan@huawei.com>
---
 testcases/network/tcp_cmds/ftp/ftp02 |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/testcases/network/tcp_cmds/ftp/ftp02 b/testcases/network/tcp_cmds/ftp/ftp02
index 92e7944..6b84f22 100755
--- a/testcases/network/tcp_cmds/ftp/ftp02
+++ b/testcases/network/tcp_cmds/ftp/ftp02
@@ -38,7 +38,7 @@
 
 setup()
 {
-	tst_check_cmds expect ftp useradd userdel
+	tst_check_cmds expect ftp useradd userdel vsftpd
 	export TEST_USER="ftpuser2"
 }
 
-- 
1.6.0.2

[LTP] [PATCH] ftp/ftp02: The case needs to check vsftpd first

[Cyril Hrubis]

Hi!
> ---
>  testcases/network/tcp_cmds/ftp/ftp02 |    2 +-
>  1 files changed, 1 insertions(+), 1 deletions(-)
> 
> diff --git a/testcases/network/tcp_cmds/ftp/ftp02 b/testcases/network/tcp_cmds/ftp/ftp02
> index 92e7944..6b84f22 100755
> --- a/testcases/network/tcp_cmds/ftp/ftp02
> +++ b/testcases/network/tcp_cmds/ftp/ftp02
> @@ -38,7 +38,7 @@
>  
>  setup()
>  {
> -	tst_check_cmds expect ftp useradd userdel
> +	tst_check_cmds expect ftp useradd userdel vsftpd
>  	export TEST_USER="ftpuser2"

I see that rest of the ftp testcases that uses vsftpd has it in
tst_check_cmds. However it would be cleaner to add this check to the top
of the ftp_setup file so that it's called at the moment the file is
sourced and remove it from the individual testcases.

-- 
Cyril Hrubis
chrubis@suse.cz

[LTP] [PATCH v2] ftp: Move commands check to ftp_setup

[Cui Bixuan]

Move commands check to ftp_setup and add vsftpd check to ftp02

Signed-off-by: Cui Bixuan <cuibixuan@huawei.com>
---
 testcases/network/tcp_cmds/ftp/ftp02     |    1 -
 testcases/network/tcp_cmds/ftp/ftp03     |    1 -
 testcases/network/tcp_cmds/ftp/ftp04     |    2 --
 testcases/network/tcp_cmds/ftp/ftp05     |    1 -
 testcases/network/tcp_cmds/ftp/ftp_setup |    2 ++
 5 files changed, 2 insertions(+), 5 deletions(-)

diff --git a/testcases/network/tcp_cmds/ftp/ftp02 b/testcases/network/tcp_cmds/ftp/ftp02
index 92e7944..1316109 100755
--- a/testcases/network/tcp_cmds/ftp/ftp02
+++ b/testcases/network/tcp_cmds/ftp/ftp02
@@ -38,7 +38,6 @@

 setup()
 {
-	tst_check_cmds expect ftp useradd userdel
 	export TEST_USER="ftpuser2"
 }

diff --git a/testcases/network/tcp_cmds/ftp/ftp03 b/testcases/network/tcp_cmds/ftp/ftp03
index 4ad5560..e2925e8 100755
--- a/testcases/network/tcp_cmds/ftp/ftp03
+++ b/testcases/network/tcp_cmds/ftp/ftp03
@@ -33,7 +33,6 @@

 setup()
 {
-	tst_check_cmds ftp useradd userdel vsftpd
 	export TEST_USER="ftpuser3"
 }

diff --git a/testcases/network/tcp_cmds/ftp/ftp04 b/testcases/network/tcp_cmds/ftp/ftp04
index f38640d..1327b8e 100755
--- a/testcases/network/tcp_cmds/ftp/ftp04
+++ b/testcases/network/tcp_cmds/ftp/ftp04
@@ -30,8 +30,6 @@

 setup()
 {
-	tst_check_cmds awk expect ftp vsftpd
-
 	TEST_USER=root

 	tvar=${MACHTYPE%-*}
diff --git a/testcases/network/tcp_cmds/ftp/ftp05 b/testcases/network/tcp_cmds/ftp/ftp05
index 65a8a67..e9e4272 100755
--- a/testcases/network/tcp_cmds/ftp/ftp05
+++ b/testcases/network/tcp_cmds/ftp/ftp05
@@ -38,7 +38,6 @@

 setup()
 {
-	tst_check_cmds expect ftp vsftpd
 	TEST_USER="anonymous"
 }

diff --git a/testcases/network/tcp_cmds/ftp/ftp_setup b/testcases/network/tcp_cmds/ftp/ftp_setup
index 1731a6d..f148281 100644
--- a/testcases/network/tcp_cmds/ftp/ftp_setup
+++ b/testcases/network/tcp_cmds/ftp/ftp_setup
@@ -26,6 +26,8 @@ do_setup()
 	export TEST_USER_ENCRYPTED_PASSWD="42VmxaOByKwlA"
 	export TEST_USER_HOMEDIR="/home/$TEST_USER"

+	tst_check_cmds awk expect ftp useradd userdel vsftpd
+
 	for vsftp_confdir in /etc/vsftpd /etc; do
 		if [ -r "$vsftp_confdir/vsftpd.conf" ]; then
 			VSFTP_CONF="$vsftp_confdir/vsftpd.conf"
-- 
1.6.0.2 .

[LTP] [PATCH v2] ftp: Move commands check to ftp_setup

[Cyril Hrubis]

Hi!
Pushed, thanks.

-- 
Cyril Hrubis
chrubis@suse.cz