Patchwork [11/26,FWTS-TEST] arg-json-0001: update test to keep in sync with fwts framework changes

login
register
mail settings
Submitter Colin King
Date March 13, 2013, 10:28 a.m.
Message ID <1363170533-10188-12-git-send-email-colin.king@canonical.com>
Download mbox | patch
Permalink /patch/227233/
State Accepted
Headers show

Comments

Colin King - March 13, 2013, 10:28 a.m.
From: Colin Ian King <colin.king@canonical.com>

fwts commit 530a24cfd5773ffb3de540c5e53e004c7bef2351 added a test
name into the output of fwts, so add this into the test output.

Signed-off-by: Colin Ian King <colin.king@canonical.com>
---
 arg-json-0001/klog-0001.log | 2 +-
 arg-json-0001/klog-0002.log | 2 +-
 arg-json-0001/klog-0003.log | 2 +-
 arg-json-0001/klog-0004.log | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)
Ivan Hu - March 14, 2013, 3:07 a.m.
On 03/13/2013 06:28 PM, Colin King wrote:
> From: Colin Ian King <colin.king@canonical.com>
>
> fwts commit 530a24cfd5773ffb3de540c5e53e004c7bef2351 added a test
> name into the output of fwts, so add this into the test output.
>
> Signed-off-by: Colin Ian King <colin.king@canonical.com>
> ---
>   arg-json-0001/klog-0001.log | 2 +-
>   arg-json-0001/klog-0002.log | 2 +-
>   arg-json-0001/klog-0003.log | 2 +-
>   arg-json-0001/klog-0004.log | 2 +-
>   4 files changed, 4 insertions(+), 4 deletions(-)
>
> diff --git a/arg-json-0001/klog-0001.log b/arg-json-0001/klog-0001.log
> index ec8e9e2..3947f3d 100644
> --- a/arg-json-0001/klog-0001.log
> +++ b/arg-json-0001/klog-0001.log
> @@ -1,4 +1,4 @@
> -klog            Scan kernel log for errors and warnings.
> +klog            klog: Scan kernel log for errors and warnings.
>   klog            ----------------------------------------------------------
>   klog            Test 1 of 1: Kernel log error check.
>   klog            FAILED [HIGH] KlogACPIBIOSBugMultipleAPIC: Test 1, HIGH
> diff --git a/arg-json-0001/klog-0002.log b/arg-json-0001/klog-0002.log
> index ec8e9e2..3947f3d 100644
> --- a/arg-json-0001/klog-0002.log
> +++ b/arg-json-0001/klog-0002.log
> @@ -1,4 +1,4 @@
> -klog            Scan kernel log for errors and warnings.
> +klog            klog: Scan kernel log for errors and warnings.
>   klog            ----------------------------------------------------------
>   klog            Test 1 of 1: Kernel log error check.
>   klog            FAILED [HIGH] KlogACPIBIOSBugMultipleAPIC: Test 1, HIGH
> diff --git a/arg-json-0001/klog-0003.log b/arg-json-0001/klog-0003.log
> index e7dd812..33b5e2e 100644
> --- a/arg-json-0001/klog-0003.log
> +++ b/arg-json-0001/klog-0003.log
> @@ -1,4 +1,4 @@
> -klog            Scan kernel log for errors and warnings.
> +klog            klog: Scan kernel log for errors and warnings.
>   klog            ----------------------------------------------------------
>   klog            Test 1 of 1: Kernel log error check.
>   klog            Cannot read file /xxxx/fooo/klog.json.
> diff --git a/arg-json-0001/klog-0004.log b/arg-json-0001/klog-0004.log
> index e7dd812..33b5e2e 100644
> --- a/arg-json-0001/klog-0004.log
> +++ b/arg-json-0001/klog-0004.log
> @@ -1,4 +1,4 @@
> -klog            Scan kernel log for errors and warnings.
> +klog            klog: Scan kernel log for errors and warnings.
>   klog            ----------------------------------------------------------
>   klog            Test 1 of 1: Kernel log error check.
>   klog            Cannot read file /xxxx/fooo/klog.json.
>

Acked-by: Ivan Hu <ivan.hu@canonical.com>
Keng-Yu Lin - March 14, 2013, 6:14 a.m.
On Wed, Mar 13, 2013 at 6:28 PM, Colin King <colin.king@canonical.com> wrote:
> From: Colin Ian King <colin.king@canonical.com>
>
> fwts commit 530a24cfd5773ffb3de540c5e53e004c7bef2351 added a test
> name into the output of fwts, so add this into the test output.
>
> Signed-off-by: Colin Ian King <colin.king@canonical.com>
> ---
>  arg-json-0001/klog-0001.log | 2 +-
>  arg-json-0001/klog-0002.log | 2 +-
>  arg-json-0001/klog-0003.log | 2 +-
>  arg-json-0001/klog-0004.log | 2 +-
>  4 files changed, 4 insertions(+), 4 deletions(-)
>
> diff --git a/arg-json-0001/klog-0001.log b/arg-json-0001/klog-0001.log
> index ec8e9e2..3947f3d 100644
> --- a/arg-json-0001/klog-0001.log
> +++ b/arg-json-0001/klog-0001.log
> @@ -1,4 +1,4 @@
> -klog            Scan kernel log for errors and warnings.
> +klog            klog: Scan kernel log for errors and warnings.
>  klog            ----------------------------------------------------------
>  klog            Test 1 of 1: Kernel log error check.
>  klog            FAILED [HIGH] KlogACPIBIOSBugMultipleAPIC: Test 1, HIGH
> diff --git a/arg-json-0001/klog-0002.log b/arg-json-0001/klog-0002.log
> index ec8e9e2..3947f3d 100644
> --- a/arg-json-0001/klog-0002.log
> +++ b/arg-json-0001/klog-0002.log
> @@ -1,4 +1,4 @@
> -klog            Scan kernel log for errors and warnings.
> +klog            klog: Scan kernel log for errors and warnings.
>  klog            ----------------------------------------------------------
>  klog            Test 1 of 1: Kernel log error check.
>  klog            FAILED [HIGH] KlogACPIBIOSBugMultipleAPIC: Test 1, HIGH
> diff --git a/arg-json-0001/klog-0003.log b/arg-json-0001/klog-0003.log
> index e7dd812..33b5e2e 100644
> --- a/arg-json-0001/klog-0003.log
> +++ b/arg-json-0001/klog-0003.log
> @@ -1,4 +1,4 @@
> -klog            Scan kernel log for errors and warnings.
> +klog            klog: Scan kernel log for errors and warnings.
>  klog            ----------------------------------------------------------
>  klog            Test 1 of 1: Kernel log error check.
>  klog            Cannot read file /xxxx/fooo/klog.json.
> diff --git a/arg-json-0001/klog-0004.log b/arg-json-0001/klog-0004.log
> index e7dd812..33b5e2e 100644
> --- a/arg-json-0001/klog-0004.log
> +++ b/arg-json-0001/klog-0004.log
> @@ -1,4 +1,4 @@
> -klog            Scan kernel log for errors and warnings.
> +klog            klog: Scan kernel log for errors and warnings.
>  klog            ----------------------------------------------------------
>  klog            Test 1 of 1: Kernel log error check.
>  klog            Cannot read file /xxxx/fooo/klog.json.
> --
> 1.8.1.2
>
Acked-by: Keng-Yu Lin <kengyu@canonical.com>

Patch

diff --git a/arg-json-0001/klog-0001.log b/arg-json-0001/klog-0001.log
index ec8e9e2..3947f3d 100644
--- a/arg-json-0001/klog-0001.log
+++ b/arg-json-0001/klog-0001.log
@@ -1,4 +1,4 @@ 
-klog            Scan kernel log for errors and warnings.
+klog            klog: Scan kernel log for errors and warnings.
 klog            ----------------------------------------------------------
 klog            Test 1 of 1: Kernel log error check.
 klog            FAILED [HIGH] KlogACPIBIOSBugMultipleAPIC: Test 1, HIGH
diff --git a/arg-json-0001/klog-0002.log b/arg-json-0001/klog-0002.log
index ec8e9e2..3947f3d 100644
--- a/arg-json-0001/klog-0002.log
+++ b/arg-json-0001/klog-0002.log
@@ -1,4 +1,4 @@ 
-klog            Scan kernel log for errors and warnings.
+klog            klog: Scan kernel log for errors and warnings.
 klog            ----------------------------------------------------------
 klog            Test 1 of 1: Kernel log error check.
 klog            FAILED [HIGH] KlogACPIBIOSBugMultipleAPIC: Test 1, HIGH
diff --git a/arg-json-0001/klog-0003.log b/arg-json-0001/klog-0003.log
index e7dd812..33b5e2e 100644
--- a/arg-json-0001/klog-0003.log
+++ b/arg-json-0001/klog-0003.log
@@ -1,4 +1,4 @@ 
-klog            Scan kernel log for errors and warnings.
+klog            klog: Scan kernel log for errors and warnings.
 klog            ----------------------------------------------------------
 klog            Test 1 of 1: Kernel log error check.
 klog            Cannot read file /xxxx/fooo/klog.json.
diff --git a/arg-json-0001/klog-0004.log b/arg-json-0001/klog-0004.log
index e7dd812..33b5e2e 100644
--- a/arg-json-0001/klog-0004.log
+++ b/arg-json-0001/klog-0004.log
@@ -1,4 +1,4 @@ 
-klog            Scan kernel log for errors and warnings.
+klog            klog: Scan kernel log for errors and warnings.
 klog            ----------------------------------------------------------
 klog            Test 1 of 1: Kernel log error check.
 klog            Cannot read file /xxxx/fooo/klog.json.