2018-05-06 21:58:06 +00:00
|
|
|
# SPDX-License-Identifier: GPL-2.0
|
2016-01-15 18:15:26 +00:00
|
|
|
# Copyright (c) 2015 Stephen Warren
|
|
|
|
# Copyright (c) 2015-2016, NVIDIA CORPORATION. All rights reserved.
|
|
|
|
|
|
|
|
# Test operation of shell commands relating to environment variables.
|
|
|
|
|
|
|
|
import pytest
|
test/py: add test for whitelist of variables while importing environment
This tests that the importing of an environment with a specified
whitelist works as intended.
If there are variables passed as parameter to the env import command,
those only should be imported in the current environment.
For each variable passed as parameter, if
- foo is bar in current env and bar2 in exported env, after importing
exported env, foo shall be bar2,
- foo does not exist in current env and foo is bar2 in exported env,
after importing exported env, foo shall be bar2,
- foo is bar in current env and does not exist in exported env (but is
passed as parameter), after importing exported env, foo shall be empty
ONLY if the -d option is passed to env import, otherwise foo shall be
bar,
Any variable not passed as parameter should be left untouched.
Two other tests are made to test that size cannot be '-' if the checksum
protection is enabled.
Signed-off-by: Quentin Schulz <quentin.schulz@bootlin.com>
Reviewed-by: Simon Glass <sjg@chromium.org>
Reviewed-by: Stephen Warren <swarren@nvidia.com>
Tested-by: Stephen Warren <swarren@nvidia.com>
2018-07-09 17:16:30 +00:00
|
|
|
import u_boot_utils
|
2016-01-15 18:15:26 +00:00
|
|
|
|
|
|
|
# FIXME: This might be useful for other tests;
|
|
|
|
# perhaps refactor it into ConsoleBase or some other state object?
|
|
|
|
class StateTestEnv(object):
|
2016-01-26 20:41:30 +00:00
|
|
|
"""Container that represents the state of all U-Boot environment variables.
|
2016-01-15 18:15:26 +00:00
|
|
|
This enables quick determination of existant/non-existant variable
|
|
|
|
names.
|
2016-01-26 20:41:30 +00:00
|
|
|
"""
|
2016-01-15 18:15:26 +00:00
|
|
|
|
|
|
|
def __init__(self, u_boot_console):
|
2016-01-26 20:41:30 +00:00
|
|
|
"""Initialize a new StateTestEnv object.
|
2016-01-15 18:15:26 +00:00
|
|
|
|
|
|
|
Args:
|
|
|
|
u_boot_console: A U-Boot console.
|
|
|
|
|
|
|
|
Returns:
|
|
|
|
Nothing.
|
2016-01-26 20:41:30 +00:00
|
|
|
"""
|
2016-01-15 18:15:26 +00:00
|
|
|
|
|
|
|
self.u_boot_console = u_boot_console
|
|
|
|
self.get_env()
|
|
|
|
self.set_var = self.get_non_existent_var()
|
|
|
|
|
|
|
|
def get_env(self):
|
2016-01-26 20:41:30 +00:00
|
|
|
"""Read all current environment variables from U-Boot.
|
2016-01-15 18:15:26 +00:00
|
|
|
|
|
|
|
Args:
|
|
|
|
None.
|
|
|
|
|
|
|
|
Returns:
|
|
|
|
Nothing.
|
2016-01-26 20:41:30 +00:00
|
|
|
"""
|
2016-01-15 18:15:26 +00:00
|
|
|
|
2016-06-16 18:59:34 +00:00
|
|
|
if self.u_boot_console.config.buildconfig.get(
|
|
|
|
'config_version_variable', 'n') == 'y':
|
2016-06-07 06:31:15 +00:00
|
|
|
with self.u_boot_console.disable_check('main_signon'):
|
|
|
|
response = self.u_boot_console.run_command('printenv')
|
|
|
|
else:
|
|
|
|
response = self.u_boot_console.run_command('printenv')
|
2016-01-15 18:15:26 +00:00
|
|
|
self.env = {}
|
|
|
|
for l in response.splitlines():
|
|
|
|
if not '=' in l:
|
|
|
|
continue
|
|
|
|
(var, value) = l.strip().split('=', 1)
|
|
|
|
self.env[var] = value
|
|
|
|
|
|
|
|
def get_existent_var(self):
|
2016-01-26 20:41:30 +00:00
|
|
|
"""Return the name of an environment variable that exists.
|
2016-01-15 18:15:26 +00:00
|
|
|
|
|
|
|
Args:
|
|
|
|
None.
|
|
|
|
|
|
|
|
Returns:
|
|
|
|
The name of an environment variable.
|
2016-01-26 20:41:30 +00:00
|
|
|
"""
|
2016-01-15 18:15:26 +00:00
|
|
|
|
|
|
|
for var in self.env:
|
|
|
|
return var
|
|
|
|
|
|
|
|
def get_non_existent_var(self):
|
2016-01-26 20:41:30 +00:00
|
|
|
"""Return the name of an environment variable that does not exist.
|
2016-01-15 18:15:26 +00:00
|
|
|
|
|
|
|
Args:
|
|
|
|
None.
|
|
|
|
|
|
|
|
Returns:
|
|
|
|
The name of an environment variable.
|
2016-01-26 20:41:30 +00:00
|
|
|
"""
|
2016-01-15 18:15:26 +00:00
|
|
|
|
|
|
|
n = 0
|
|
|
|
while True:
|
|
|
|
var = 'test_env_' + str(n)
|
|
|
|
if var not in self.env:
|
|
|
|
return var
|
|
|
|
n += 1
|
|
|
|
|
test/py: move U-Boot respawn trigger to the test core
Prior to this change, U-Boot was lazilly (re-)spawned if/when a test
attempted to interact with it, and no active connection existed. This
approach was simple, yet had the disadvantage that U-Boot might be
spawned in the middle of a test function, e.g. after the test had already
performed actions such as creating data files, etc. In that case, this
could cause the log to contain the sequence (1) some test logs, (2)
U-Boot's boot process, (3) the rest of that test's logs. This isn't
optimally readable. This issue will affect the upcoming DFU and enhanced
UMS tests.
This change converts u_boot_console to be a function-scoped fixture, so
that pytest attempts to re-create the object for each test invocation.
This allows the fixture factory function to ensure that U-Boot is spawned
prior to every test. In practice, the same object is returned each time
so there is essentially no additional overhead due to this change.
This allows us to remove:
- The explicit ensure_spawned() call from test_sleep, since the core now
ensures that the spawn happens before the test code is executed.
- The laxy calls to ensure_spawned() in the u_boot_console_*
implementations.
The one downside is that test_env's "state_ttest_env" fixture must be
converted to a function-scoped fixture too, since a module-scoped fixture
cannot use a function-scoped fixture. To avoid overhead, we use the same
trick of returning the same object each time.
Signed-off-by: Stephen Warren <swarren@nvidia.com>
Acked-by: Simon Glass <sjg@chromium.org>
2016-01-22 19:30:08 +00:00
|
|
|
ste = None
|
|
|
|
@pytest.fixture(scope='function')
|
2016-01-15 18:15:26 +00:00
|
|
|
def state_test_env(u_boot_console):
|
2016-01-26 20:41:30 +00:00
|
|
|
"""pytest fixture to provide a StateTestEnv object to tests."""
|
2016-01-15 18:15:26 +00:00
|
|
|
|
test/py: move U-Boot respawn trigger to the test core
Prior to this change, U-Boot was lazilly (re-)spawned if/when a test
attempted to interact with it, and no active connection existed. This
approach was simple, yet had the disadvantage that U-Boot might be
spawned in the middle of a test function, e.g. after the test had already
performed actions such as creating data files, etc. In that case, this
could cause the log to contain the sequence (1) some test logs, (2)
U-Boot's boot process, (3) the rest of that test's logs. This isn't
optimally readable. This issue will affect the upcoming DFU and enhanced
UMS tests.
This change converts u_boot_console to be a function-scoped fixture, so
that pytest attempts to re-create the object for each test invocation.
This allows the fixture factory function to ensure that U-Boot is spawned
prior to every test. In practice, the same object is returned each time
so there is essentially no additional overhead due to this change.
This allows us to remove:
- The explicit ensure_spawned() call from test_sleep, since the core now
ensures that the spawn happens before the test code is executed.
- The laxy calls to ensure_spawned() in the u_boot_console_*
implementations.
The one downside is that test_env's "state_ttest_env" fixture must be
converted to a function-scoped fixture too, since a module-scoped fixture
cannot use a function-scoped fixture. To avoid overhead, we use the same
trick of returning the same object each time.
Signed-off-by: Stephen Warren <swarren@nvidia.com>
Acked-by: Simon Glass <sjg@chromium.org>
2016-01-22 19:30:08 +00:00
|
|
|
global ste
|
|
|
|
if not ste:
|
|
|
|
ste = StateTestEnv(u_boot_console)
|
|
|
|
return ste
|
2016-01-15 18:15:26 +00:00
|
|
|
|
|
|
|
def unset_var(state_test_env, var):
|
2016-01-26 20:41:30 +00:00
|
|
|
"""Unset an environment variable.
|
2016-01-15 18:15:26 +00:00
|
|
|
|
|
|
|
This both executes a U-Boot shell command and updates a StateTestEnv
|
|
|
|
object.
|
|
|
|
|
|
|
|
Args:
|
2016-01-28 17:18:03 +00:00
|
|
|
state_test_env: The StateTestEnv object to update.
|
2016-01-15 18:15:26 +00:00
|
|
|
var: The variable name to unset.
|
|
|
|
|
|
|
|
Returns:
|
|
|
|
Nothing.
|
2016-01-26 20:41:30 +00:00
|
|
|
"""
|
2016-01-15 18:15:26 +00:00
|
|
|
|
|
|
|
state_test_env.u_boot_console.run_command('setenv %s' % var)
|
|
|
|
if var in state_test_env.env:
|
|
|
|
del state_test_env.env[var]
|
|
|
|
|
|
|
|
def set_var(state_test_env, var, value):
|
2016-01-26 20:41:30 +00:00
|
|
|
"""Set an environment variable.
|
2016-01-15 18:15:26 +00:00
|
|
|
|
|
|
|
This both executes a U-Boot shell command and updates a StateTestEnv
|
|
|
|
object.
|
|
|
|
|
|
|
|
Args:
|
2016-01-28 17:18:03 +00:00
|
|
|
state_test_env: The StateTestEnv object to update.
|
2016-01-15 18:15:26 +00:00
|
|
|
var: The variable name to set.
|
|
|
|
value: The value to set the variable to.
|
|
|
|
|
|
|
|
Returns:
|
|
|
|
Nothing.
|
2016-01-26 20:41:30 +00:00
|
|
|
"""
|
2016-01-15 18:15:26 +00:00
|
|
|
|
2017-11-10 10:59:15 +00:00
|
|
|
bc = state_test_env.u_boot_console.config.buildconfig
|
|
|
|
if bc.get('config_hush_parser', None):
|
|
|
|
quote = '"'
|
|
|
|
else:
|
|
|
|
quote = ''
|
|
|
|
if ' ' in value:
|
|
|
|
pytest.skip('Space in variable value on non-Hush shell')
|
|
|
|
|
|
|
|
state_test_env.u_boot_console.run_command(
|
|
|
|
'setenv %s %s%s%s' % (var, quote, value, quote))
|
2016-01-15 18:15:26 +00:00
|
|
|
state_test_env.env[var] = value
|
|
|
|
|
|
|
|
def validate_empty(state_test_env, var):
|
2016-01-26 20:41:30 +00:00
|
|
|
"""Validate that a variable is not set, using U-Boot shell commands.
|
2016-01-15 18:15:26 +00:00
|
|
|
|
|
|
|
Args:
|
|
|
|
var: The variable name to test.
|
|
|
|
|
|
|
|
Returns:
|
|
|
|
Nothing.
|
2016-01-26 20:41:30 +00:00
|
|
|
"""
|
2016-01-15 18:15:26 +00:00
|
|
|
|
|
|
|
response = state_test_env.u_boot_console.run_command('echo $%s' % var)
|
|
|
|
assert response == ''
|
|
|
|
|
|
|
|
def validate_set(state_test_env, var, value):
|
2016-01-26 20:41:30 +00:00
|
|
|
"""Validate that a variable is set, using U-Boot shell commands.
|
2016-01-15 18:15:26 +00:00
|
|
|
|
|
|
|
Args:
|
|
|
|
var: The variable name to test.
|
|
|
|
value: The value the variable is expected to have.
|
|
|
|
|
|
|
|
Returns:
|
|
|
|
Nothing.
|
2016-01-26 20:41:30 +00:00
|
|
|
"""
|
2016-01-15 18:15:26 +00:00
|
|
|
|
|
|
|
# echo does not preserve leading, internal, or trailing whitespace in the
|
|
|
|
# value. printenv does, and hence allows more complete testing.
|
|
|
|
response = state_test_env.u_boot_console.run_command('printenv %s' % var)
|
|
|
|
assert response == ('%s=%s' % (var, value))
|
|
|
|
|
|
|
|
def test_env_echo_exists(state_test_env):
|
2016-01-26 20:41:30 +00:00
|
|
|
"""Test echoing a variable that exists."""
|
2016-01-15 18:15:26 +00:00
|
|
|
|
|
|
|
var = state_test_env.get_existent_var()
|
|
|
|
value = state_test_env.env[var]
|
|
|
|
validate_set(state_test_env, var, value)
|
|
|
|
|
2017-05-15 12:29:02 +00:00
|
|
|
@pytest.mark.buildconfigspec('cmd_echo')
|
2016-01-15 18:15:26 +00:00
|
|
|
def test_env_echo_non_existent(state_test_env):
|
2016-01-26 20:41:30 +00:00
|
|
|
"""Test echoing a variable that doesn't exist."""
|
2016-01-15 18:15:26 +00:00
|
|
|
|
|
|
|
var = state_test_env.set_var
|
|
|
|
validate_empty(state_test_env, var)
|
|
|
|
|
|
|
|
def test_env_printenv_non_existent(state_test_env):
|
2016-01-26 20:41:30 +00:00
|
|
|
"""Test printenv error message for non-existant variables."""
|
2016-01-15 18:15:26 +00:00
|
|
|
|
|
|
|
var = state_test_env.set_var
|
|
|
|
c = state_test_env.u_boot_console
|
|
|
|
with c.disable_check('error_notification'):
|
|
|
|
response = c.run_command('printenv %s' % var)
|
|
|
|
assert(response == '## Error: "%s" not defined' % var)
|
|
|
|
|
2017-05-15 12:29:02 +00:00
|
|
|
@pytest.mark.buildconfigspec('cmd_echo')
|
2016-01-15 18:15:26 +00:00
|
|
|
def test_env_unset_non_existent(state_test_env):
|
2016-01-26 20:41:30 +00:00
|
|
|
"""Test unsetting a nonexistent variable."""
|
2016-01-15 18:15:26 +00:00
|
|
|
|
|
|
|
var = state_test_env.get_non_existent_var()
|
|
|
|
unset_var(state_test_env, var)
|
|
|
|
validate_empty(state_test_env, var)
|
|
|
|
|
|
|
|
def test_env_set_non_existent(state_test_env):
|
2016-01-26 20:41:30 +00:00
|
|
|
"""Test set a non-existant variable."""
|
2016-01-15 18:15:26 +00:00
|
|
|
|
|
|
|
var = state_test_env.set_var
|
|
|
|
value = 'foo'
|
|
|
|
set_var(state_test_env, var, value)
|
|
|
|
validate_set(state_test_env, var, value)
|
|
|
|
|
|
|
|
def test_env_set_existing(state_test_env):
|
2016-01-26 20:41:30 +00:00
|
|
|
"""Test setting an existant variable."""
|
2016-01-15 18:15:26 +00:00
|
|
|
|
|
|
|
var = state_test_env.set_var
|
|
|
|
value = 'bar'
|
|
|
|
set_var(state_test_env, var, value)
|
|
|
|
validate_set(state_test_env, var, value)
|
|
|
|
|
2017-05-15 12:29:02 +00:00
|
|
|
@pytest.mark.buildconfigspec('cmd_echo')
|
2016-01-15 18:15:26 +00:00
|
|
|
def test_env_unset_existing(state_test_env):
|
2016-01-26 20:41:30 +00:00
|
|
|
"""Test unsetting a variable."""
|
2016-01-15 18:15:26 +00:00
|
|
|
|
|
|
|
var = state_test_env.set_var
|
|
|
|
unset_var(state_test_env, var)
|
|
|
|
validate_empty(state_test_env, var)
|
|
|
|
|
|
|
|
def test_env_expansion_spaces(state_test_env):
|
2016-01-26 20:41:30 +00:00
|
|
|
"""Test expanding a variable that contains a space in its value."""
|
2016-01-15 18:15:26 +00:00
|
|
|
|
|
|
|
var_space = None
|
|
|
|
var_test = None
|
|
|
|
try:
|
|
|
|
var_space = state_test_env.get_non_existent_var()
|
|
|
|
set_var(state_test_env, var_space, ' ')
|
|
|
|
|
|
|
|
var_test = state_test_env.get_non_existent_var()
|
|
|
|
value = ' 1${%(var_space)s}${%(var_space)s} 2 ' % locals()
|
|
|
|
set_var(state_test_env, var_test, value)
|
|
|
|
value = ' 1 2 '
|
|
|
|
validate_set(state_test_env, var_test, value)
|
|
|
|
finally:
|
|
|
|
if var_space:
|
|
|
|
unset_var(state_test_env, var_space)
|
|
|
|
if var_test:
|
|
|
|
unset_var(state_test_env, var_test)
|
test/py: add test for whitelist of variables while importing environment
This tests that the importing of an environment with a specified
whitelist works as intended.
If there are variables passed as parameter to the env import command,
those only should be imported in the current environment.
For each variable passed as parameter, if
- foo is bar in current env and bar2 in exported env, after importing
exported env, foo shall be bar2,
- foo does not exist in current env and foo is bar2 in exported env,
after importing exported env, foo shall be bar2,
- foo is bar in current env and does not exist in exported env (but is
passed as parameter), after importing exported env, foo shall be empty
ONLY if the -d option is passed to env import, otherwise foo shall be
bar,
Any variable not passed as parameter should be left untouched.
Two other tests are made to test that size cannot be '-' if the checksum
protection is enabled.
Signed-off-by: Quentin Schulz <quentin.schulz@bootlin.com>
Reviewed-by: Simon Glass <sjg@chromium.org>
Reviewed-by: Stephen Warren <swarren@nvidia.com>
Tested-by: Stephen Warren <swarren@nvidia.com>
2018-07-09 17:16:30 +00:00
|
|
|
|
|
|
|
@pytest.mark.buildconfigspec('cmd_importenv')
|
|
|
|
def test_env_import_checksum_no_size(state_test_env):
|
|
|
|
"""Test that omitted ('-') size parameter with checksum validation fails the
|
|
|
|
env import function.
|
|
|
|
"""
|
|
|
|
c = state_test_env.u_boot_console
|
|
|
|
ram_base = u_boot_utils.find_ram_base(state_test_env.u_boot_console)
|
|
|
|
addr = '%08x' % ram_base
|
|
|
|
|
|
|
|
with c.disable_check('error_notification'):
|
|
|
|
response = c.run_command('env import -c %s -' % addr)
|
|
|
|
assert(response == '## Error: external checksum format must pass size')
|
|
|
|
|
|
|
|
@pytest.mark.buildconfigspec('cmd_importenv')
|
|
|
|
def test_env_import_whitelist_checksum_no_size(state_test_env):
|
|
|
|
"""Test that omitted ('-') size parameter with checksum validation fails the
|
|
|
|
env import function when variables are passed as parameters.
|
|
|
|
"""
|
|
|
|
c = state_test_env.u_boot_console
|
|
|
|
ram_base = u_boot_utils.find_ram_base(state_test_env.u_boot_console)
|
|
|
|
addr = '%08x' % ram_base
|
|
|
|
|
|
|
|
with c.disable_check('error_notification'):
|
|
|
|
response = c.run_command('env import -c %s - foo1 foo2 foo4' % addr)
|
|
|
|
assert(response == '## Error: external checksum format must pass size')
|
|
|
|
|
|
|
|
@pytest.mark.buildconfigspec('cmd_exportenv')
|
|
|
|
@pytest.mark.buildconfigspec('cmd_importenv')
|
|
|
|
def test_env_import_whitelist(state_test_env):
|
|
|
|
"""Test importing only a handful of env variables from an environment."""
|
|
|
|
c = state_test_env.u_boot_console
|
|
|
|
ram_base = u_boot_utils.find_ram_base(state_test_env.u_boot_console)
|
|
|
|
addr = '%08x' % ram_base
|
|
|
|
|
|
|
|
set_var(state_test_env, 'foo1', 'bar1')
|
|
|
|
set_var(state_test_env, 'foo2', 'bar2')
|
|
|
|
set_var(state_test_env, 'foo3', 'bar3')
|
|
|
|
|
|
|
|
c.run_command('env export %s' % addr)
|
|
|
|
|
|
|
|
unset_var(state_test_env, 'foo1')
|
|
|
|
set_var(state_test_env, 'foo2', 'test2')
|
|
|
|
set_var(state_test_env, 'foo4', 'bar4')
|
|
|
|
|
|
|
|
# no foo1 in current env, foo2 overridden, foo3 should be of the value
|
|
|
|
# before exporting and foo4 should be of the value before importing.
|
|
|
|
c.run_command('env import %s - foo1 foo2 foo4' % addr)
|
|
|
|
|
|
|
|
validate_set(state_test_env, 'foo1', 'bar1')
|
|
|
|
validate_set(state_test_env, 'foo2', 'bar2')
|
|
|
|
validate_set(state_test_env, 'foo3', 'bar3')
|
|
|
|
validate_set(state_test_env, 'foo4', 'bar4')
|
|
|
|
|
|
|
|
# Cleanup test environment
|
|
|
|
unset_var(state_test_env, 'foo1')
|
|
|
|
unset_var(state_test_env, 'foo2')
|
|
|
|
unset_var(state_test_env, 'foo3')
|
|
|
|
unset_var(state_test_env, 'foo4')
|
|
|
|
|
|
|
|
@pytest.mark.buildconfigspec('cmd_exportenv')
|
|
|
|
@pytest.mark.buildconfigspec('cmd_importenv')
|
|
|
|
def test_env_import_whitelist_delete(state_test_env):
|
|
|
|
|
|
|
|
"""Test importing only a handful of env variables from an environment, with.
|
|
|
|
deletion if a var A that is passed to env import is not in the
|
|
|
|
environment to be imported.
|
|
|
|
"""
|
|
|
|
c = state_test_env.u_boot_console
|
|
|
|
ram_base = u_boot_utils.find_ram_base(state_test_env.u_boot_console)
|
|
|
|
addr = '%08x' % ram_base
|
|
|
|
|
|
|
|
set_var(state_test_env, 'foo1', 'bar1')
|
|
|
|
set_var(state_test_env, 'foo2', 'bar2')
|
|
|
|
set_var(state_test_env, 'foo3', 'bar3')
|
|
|
|
|
|
|
|
c.run_command('env export %s' % addr)
|
|
|
|
|
|
|
|
unset_var(state_test_env, 'foo1')
|
|
|
|
set_var(state_test_env, 'foo2', 'test2')
|
|
|
|
set_var(state_test_env, 'foo4', 'bar4')
|
|
|
|
|
|
|
|
# no foo1 in current env, foo2 overridden, foo3 should be of the value
|
|
|
|
# before exporting and foo4 should be empty.
|
|
|
|
c.run_command('env import -d %s - foo1 foo2 foo4' % addr)
|
|
|
|
|
|
|
|
validate_set(state_test_env, 'foo1', 'bar1')
|
|
|
|
validate_set(state_test_env, 'foo2', 'bar2')
|
|
|
|
validate_set(state_test_env, 'foo3', 'bar3')
|
|
|
|
validate_empty(state_test_env, 'foo4')
|
|
|
|
|
|
|
|
# Cleanup test environment
|
|
|
|
unset_var(state_test_env, 'foo1')
|
|
|
|
unset_var(state_test_env, 'foo2')
|
|
|
|
unset_var(state_test_env, 'foo3')
|
|
|
|
unset_var(state_test_env, 'foo4')
|