Re: [Fuego] [PATCH] batch: Fix test case batch.

Re: [Fuego] [PATCH] batch: Fix test case batch.

[Tim.Bird]

Looks good.

Applied to my 'next' branch.

Please note that my 'next' branch has different paths, which I had to fix up 
in this patch before applying the code.  I have removed the 'engine'
directory in 'fuego-core'.  'fuego-core/engine/tests' is now just
'fuego-core/tests'.

This will make dealing with patches somewhat painful for the next little
bit.  I'm trying to decide how best to handle this, but for now this is applied
(as stated) to my 'next' branch.  If you'd like it applied to the 'master'
branch as a bugfix, please let me know.
 -- Tim

> -----Original Message-----
> From: fuego-bounces@lists.linuxfoundation.org [mailto:fuego-
> bounces@lists.linuxfoundation.org] On Behalf Of Zheng Ruoqin
> Sent: Thursday, January 31, 2019 3:22 PM
> To: fuego@lists.linuxfoundation.org
> Subject: [Fuego] [PATCH] batch: Fix test case batch.
> 
> Fix some syntax error for batch test.
> 
> Signed-off-by: Zheng Ruoqin <zhengrq.fnst@cn.fujitsu.com>
> ---
>  engine/tests/Functional.batch/tests/batch.sh | 8 ++++----
>  1 file changed, 4 insertions(+), 4 deletions(-)
> 
> diff --git a/engine/tests/Functional.batch/tests/batch.sh
> b/engine/tests/Functional.batch/tests/batch.sh
> index b3d8907..a4be900 100644
> --- a/engine/tests/Functional.batch/tests/batch.sh
> +++ b/engine/tests/Functional.batch/tests/batch.sh
> @@ -5,7 +5,7 @@
> 
>  test="batch"
> 
> -if /tmp/batch_result
> +if [ -f /tmp/batch_result ]
>  then
>      rm /tmp/batch_result
>  fi
> @@ -15,7 +15,7 @@ spawn batch
>  expect {
>   -re ".*at.*" {
>             send_user " -> $test: batch executed.\n"
> -           send "echo batch test done > /tmp/batch_result\n"
> +           send "echo \"batch test done\" > /tmp/batch_result\n"
>            }
>   default { send_user " -> $test: TEST-FAIL\n" }
>   }
> @@ -24,9 +24,9 @@ send_user " -> $test: batch executed succeeded.\n"
>  expect eof
>  EOF
> 
> -sleep 5
> +sleep 20
> 
> -if cat /tmp/batch_result | grep "batch test done"
> +if grep "batch test done" /tmp/batch_result
>  then
>      echo ' -> $test: TEST-PASS'
>  else
> --
> 1.8.3.1
> 
> 
> 
> _______________________________________________
> Fuego mailing list
> Fuego@lists.linuxfoundation.org
> https://lists.linuxfoundation.org/mailman/listinfo/fuego

[Fuego] [PATCH] batch: Fix test case batch.

[Zheng Ruoqin]

Fix some syntax error for batch test.

Signed-off-by: Zheng Ruoqin <zhengrq.fnst@cn.fujitsu.com>
---
 engine/tests/Functional.batch/tests/batch.sh | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/engine/tests/Functional.batch/tests/batch.sh b/engine/tests/Functional.batch/tests/batch.sh
index b3d8907..a4be900 100644
--- a/engine/tests/Functional.batch/tests/batch.sh
+++ b/engine/tests/Functional.batch/tests/batch.sh
@@ -5,7 +5,7 @@
 
 test="batch"
 
-if /tmp/batch_result
+if [ -f /tmp/batch_result ]
 then
     rm /tmp/batch_result
 fi
@@ -15,7 +15,7 @@ spawn batch
 expect {
  -re ".*at.*" {
            send_user " -> $test: batch executed.\n"
-           send "echo batch test done > /tmp/batch_result\n"
+           send "echo \"batch test done\" > /tmp/batch_result\n"
           }
  default { send_user " -> $test: TEST-FAIL\n" }
  }
@@ -24,9 +24,9 @@ send_user " -> $test: batch executed succeeded.\n"
 expect eof
 EOF
 
-sleep 5
+sleep 20
 
-if cat /tmp/batch_result | grep "batch test done"
+if grep "batch test done" /tmp/batch_result
 then
     echo ' -> $test: TEST-PASS'
 else
-- 
1.8.3.1