[U-Boot] [PATCH] test/py: fix printenv signon message disable code

[U-Boot] [PATCH] test/py: fix printenv signon message disable code

[Stephen Warren]

From: Stephen Warren <swarren@nvidia.com>

CONFIG_VERSION_VARIABLE isn't always defined, so we can't simply look up
its value directly, or an exception will occur if it isn't defined.
Instead, we must use .get() to supply a default value if the variable
isn't defined.

Fixes: da37f006e7c5 ("tests: py: disable main_signon check for printenv cmd")
Cc: Heiko Schocher <hs@denx.de>
Signed-off-by: Stephen Warren <swarren@nvidia.com>
---
 test/py/tests/test_env.py | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/test/py/tests/test_env.py b/test/py/tests/test_env.py
index 22a22d1d538b..035dbf5cac4c 100644
--- a/test/py/tests/test_env.py
+++ b/test/py/tests/test_env.py
@@ -39,7 +39,8 @@ class StateTestEnv(object):
             Nothing.
         """
 
-        if self.u_boot_console.config.buildconfig['config_version_variable'] == 'y':
+        if self.u_boot_console.config.buildconfig.get(
+                'config_version_variable', 'n') == 'y':
             with self.u_boot_console.disable_check('main_signon'):
                 response = self.u_boot_console.run_command('printenv')
         else:
-- 
2.9.0

[U-Boot] [PATCH] test/py: fix printenv signon message disable code

[Heiko Schocher]

Hello Stephen,

Am 16.06.2016 um 20:59 schrieb Stephen Warren:
> From: Stephen Warren <swarren@nvidia.com>
>
> CONFIG_VERSION_VARIABLE isn't always defined, so we can't simply look up
> its value directly, or an exception will occur if it isn't defined.
> Instead, we must use .get() to supply a default value if the variable
> isn't defined.
>
> Fixes: da37f006e7c5 ("tests: py: disable main_signon check for printenv cmd")
> Cc: Heiko Schocher <hs@denx.de>
> Signed-off-by: Stephen Warren <swarren@nvidia.com>
> ---
>   test/py/tests/test_env.py | 3 ++-
>   1 file changed, 2 insertions(+), 1 deletion(-)

Thanks!
Acked-by: Heiko Schocher <hs@denx.de>

> diff --git a/test/py/tests/test_env.py b/test/py/tests/test_env.py
> index 22a22d1d538b..035dbf5cac4c 100644
> --- a/test/py/tests/test_env.py
> +++ b/test/py/tests/test_env.py
> @@ -39,7 +39,8 @@ class StateTestEnv(object):
>               Nothing.
>           """
>
> -        if self.u_boot_console.config.buildconfig['config_version_variable'] == 'y':
> +        if self.u_boot_console.config.buildconfig.get(
> +                'config_version_variable', 'n') == 'y':
>               with self.u_boot_console.disable_check('main_signon'):
>                   response = self.u_boot_console.run_command('printenv')
>           else:

Hmm... may we should also move VERSION_VARIABLE to Kconfig?

bye,
Heiko
-- 
DENX Software Engineering GmbH,      Managing Director: Wolfgang Denk
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany

[U-Boot] [PATCH] test/py: fix printenv signon message disable code

[Stephen Warren]

On 06/16/2016 10:38 PM, Heiko Schocher wrote:
> Hello Stephen,
>
> Am 16.06.2016 um 20:59 schrieb Stephen Warren:
>> From: Stephen Warren <swarren@nvidia.com>
>>
>> CONFIG_VERSION_VARIABLE isn't always defined, so we can't simply look up
>> its value directly, or an exception will occur if it isn't defined.
>> Instead, we must use .get() to supply a default value if the variable
>> isn't defined.
>>
>> Fixes: da37f006e7c5 ("tests: py: disable main_signon check for
>> printenv cmd")
>> Cc: Heiko Schocher <hs@denx.de>
>> Signed-off-by: Stephen Warren <swarren@nvidia.com>
>> ---
>>   test/py/tests/test_env.py | 3 ++-
>>   1 file changed, 2 insertions(+), 1 deletion(-)
>
> Thanks!
> Acked-by: Heiko Schocher <hs@denx.de>
>
>> diff --git a/test/py/tests/test_env.py b/test/py/tests/test_env.py
>> index 22a22d1d538b..035dbf5cac4c 100644
>> --- a/test/py/tests/test_env.py
>> +++ b/test/py/tests/test_env.py
>> @@ -39,7 +39,8 @@ class StateTestEnv(object):
>>               Nothing.
>>           """
>>
>> -        if
>> self.u_boot_console.config.buildconfig['config_version_variable'] == 'y':
>> +        if self.u_boot_console.config.buildconfig.get(
>> +                'config_version_variable', 'n') == 'y':
>>               with self.u_boot_console.disable_check('main_signon'):
>>                   response = self.u_boot_console.run_command('printenv')
>>           else:
>
> Hmm... may we should also move VERSION_VARIABLE to Kconfig?

Be my guest:-) I believe the check above will automatically adapt to 
such a change, because the buildconfig object contains the union of all 
options found in .config (from Kconfig) and include/autoconf.mk (from 
include/configs/xxx.h).

[U-Boot] [PATCH] test/py: fix printenv signon message disable code

[Tom Rini]

On Thu, Jun 16, 2016 at 12:59:34PM -0600, Stephen Warren wrote:

> From: Stephen Warren <swarren@nvidia.com>
> 
> CONFIG_VERSION_VARIABLE isn't always defined, so we can't simply look up
> its value directly, or an exception will occur if it isn't defined.
> Instead, we must use .get() to supply a default value if the variable
> isn't defined.
> 
> Fixes: da37f006e7c5 ("tests: py: disable main_signon check for printenv cmd")
> Acked-by: Heiko Schocher <hs@denx.de>
> Signed-off-by: Stephen Warren <swarren@nvidia.com>

Applied to u-boot/master, thanks!

-- 
Tom
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 819 bytes
Desc: Digital signature
URL: <http://lists.denx.de/pipermail/u-boot/attachments/20160619/08878f01/attachment.sig>