[PATCH 21/21] classes/testimage: Fix exportTests function.

[PATCH 21/21] classes/testimage: Fix exportTests function.

[Aníbal Limón]

With new structure of TestContext now holds suite and variable
that contains unittest instances,  it can't be exported using
JSON causing and exception.

Adds the suite variable for avoid export it.

Signed-off-by: Aníbal Limón <anibal.limon@linux.intel.com>
---
 meta/classes/testimage.bbclass | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/meta/classes/testimage.bbclass b/meta/classes/testimage.bbclass
index 5fafda1..57858e6 100644
--- a/meta/classes/testimage.bbclass
+++ b/meta/classes/testimage.bbclass
@@ -112,7 +112,7 @@ def exportTests(d,tc):
     savedata["host_dumper"] = {}
     for key in tc.__dict__:
         # special cases
-        if key != "d" and key != "target" and key != "host_dumper":
+        if key != "d" and key != "target" and key != "host_dumper" and key != "suite":
             savedata[key] = getattr(tc, key)
     savedata["target"]["ip"] = tc.target.ip or d.getVar("TEST_TARGET_IP", True)
     savedata["target"]["server_ip"] = tc.target.server_ip or d.getVar("TEST_SERVER_IP", True)
-- 
2.1.4

Re: [PATCH 21/21] classes/testimage: Fix exportTests function.

[Paul Eggleton]

On Tue, 02 Feb 2016 12:09:37 Aníbal Limón wrote:
> With new structure of TestContext now holds suite and variable
> that contains unittest instances,  it can't be exported using
> JSON causing and exception.
> 
> Adds the suite variable for avoid export it.
> 
> Signed-off-by: Aníbal Limón <anibal.limon@linux.intel.com>
> ---
>  meta/classes/testimage.bbclass | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/meta/classes/testimage.bbclass b/meta/classes/testimage.bbclass
> index 5fafda1..57858e6 100644
> --- a/meta/classes/testimage.bbclass
> +++ b/meta/classes/testimage.bbclass
> @@ -112,7 +112,7 @@ def exportTests(d,tc):
>      savedata["host_dumper"] = {}
>      for key in tc.__dict__:
>          # special cases
> -        if key != "d" and key != "target" and key != "host_dumper":
> +        if key != "d" and key != "target" and key != "host_dumper" and key
> != "suite": savedata[key] = getattr(tc, key)

Given how long this is getting we might want to change to:

  if key not in ['d', 'target', 'host_dumper', 'suite']:

Cheers,
Paul

-- 

Paul Eggleton
Intel Open Source Technology Centre

Re: [PATCH 21/21] classes/testimage: Fix exportTests function.

[Aníbal Limón]

[-- Attachment #1: Type: text/plain, Size: 1215 bytes --]



On 02/02/2016 04:30 PM, Paul Eggleton wrote:
> On Tue, 02 Feb 2016 12:09:37 Aníbal Limón wrote:
>> With new structure of TestContext now holds suite and variable
>> that contains unittest instances,  it can't be exported using
>> JSON causing and exception.
>>
>> Adds the suite variable for avoid export it.
>>
>> Signed-off-by: Aníbal Limón <anibal.limon@linux.intel.com>
>> ---
>>  meta/classes/testimage.bbclass | 2 +-
>>  1 file changed, 1 insertion(+), 1 deletion(-)
>>
>> diff --git a/meta/classes/testimage.bbclass b/meta/classes/testimage.bbclass
>> index 5fafda1..57858e6 100644
>> --- a/meta/classes/testimage.bbclass
>> +++ b/meta/classes/testimage.bbclass
>> @@ -112,7 +112,7 @@ def exportTests(d,tc):
>>      savedata["host_dumper"] = {}
>>      for key in tc.__dict__:
>>          # special cases
>> -        if key != "d" and key != "target" and key != "host_dumper":
>> +        if key != "d" and key != "target" and key != "host_dumper" and key
>> != "suite": savedata[key] = getattr(tc, key)
> 
> Given how long this is getting we might want to change to:
> 
>   if key not in ['d', 'target', 'host_dumper', 'suite']:

Good one...

> 
> Cheers,
> Paul
> 


[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 836 bytes --]