public inbox for u-boot@lists.denx.de
 help / color / mirror / Atom feed
From: Patrick Delaunay <patrick.delaunay@st.com>
To: u-boot@lists.denx.de
Subject: [PATCH v2 6/9] test: environment in ext4
Date: Tue, 16 Jun 2020 09:40:45 +0200	[thread overview]
Message-ID: <20200616074048.7898-7-patrick.delaunay@st.com> (raw)
In-Reply-To: <20200616074048.7898-1-patrick.delaunay@st.com>

Add basic test to persistent environment in ext4:
save and load in host ext4 file 'uboot.env'.

On first execution an empty EXT4 file system is created in
persistent data dir: env.ext4.img.

Signed-off-by: Patrick Delaunay <patrick.delaunay@st.com>
---

(no changes since v1)

 test/py/tests/test_env.py | 87 +++++++++++++++++++++++++++++++++++++++
 1 file changed, 87 insertions(+)

diff --git a/test/py/tests/test_env.py b/test/py/tests/test_env.py
index cbdb41031c..6f1d94b953 100644
--- a/test/py/tests/test_env.py
+++ b/test/py/tests/test_env.py
@@ -4,6 +4,10 @@
 
 # Test operation of shell commands relating to environment variables.
 
+import os
+import os.path
+from subprocess import call, check_call
+
 import pytest
 import u_boot_utils
 
@@ -380,3 +384,86 @@ def test_env_info_quiet(state_test_env):
     assert response == ""
     response = c.run_command('echo $?')
     assert response == "1"
+
+def mk_env_ext4(state_test_env):
+    c = state_test_env.u_boot_console
+
+    """Create a empty ext4 file system volume.
+    """
+    filename = 'env.ext4.img'
+    persistent = c.config.persistent_data_dir + '/' + filename
+    fs_img = c.config.result_dir  + '/' + filename
+
+    if os.path.exists(persistent):
+        c.log.action('Disk image file ' + persistent + ' already exists')
+    else:
+        try:
+            check_call('rm -f %s' % persistent, shell=True)
+            check_call('dd if=/dev/zero of=%s bs=1M count=16'
+                % persistent, shell=True)
+            check_call('mkfs.ext4 -O ^metadata_csum %s' % persistent, shell=True)
+        except CalledProcessError:
+            call('rm -f %s' % persistent, shell=True)
+            raise
+
+    call('cp -f %s %s' % (persistent, fs_img), shell=True)
+    return fs_img
+
+ at pytest.mark.boardspec('sandbox')
+ at pytest.mark.buildconfigspec('cmd_nvedit_info')
+ at pytest.mark.buildconfigspec('cmd_echo')
+ at pytest.mark.buildconfigspec('env_is_in_ext4')
+def test_env_ext4(state_test_env):
+
+    c = state_test_env.u_boot_console
+
+    fs_img = mk_env_ext4(state_test_env)
+    c.run_command('host bind 0  %s' % fs_img)
+
+    response = c.run_command('ext4ls host 0:0')
+    assert 'uboot.env' not in response
+
+    """ env location: ENVL_EXT4 (2)
+    """
+    response = c.run_command('env_loc 2')
+    assert 'Saving Environment to EXT4' in response
+
+    response = c.run_command('env_loc 2')
+    assert 'Loading Environment from EXT4... OK' in response
+
+    response = c.run_command('ext4ls host 0:0')
+    assert '8192 uboot.env' in response
+
+    response = c.run_command('env info')
+    assert 'env_valid = valid' in response
+    assert 'env_ready = true' in response
+    assert 'env_use_default = false' in response
+
+    response = c.run_command('env info -p -d')
+    assert 'Environment was loaded from persistent storage' in response
+    assert 'Environment can be persisted' in response
+
+    response = c.run_command('env info -d -q')
+    assert response == ""
+    response = c.run_command('echo $?')
+    assert response == "1"
+
+    response = c.run_command('env info -p -q')
+    assert response == ""
+    response = c.run_command('echo $?')
+    assert response == "0"
+
+    """ restore env location: ENVL_NOWHERE (12)
+    """
+    c.run_command('env_loc 12')
+
+    response = c.run_command('env info')
+    assert 'env_valid = valid' in response
+    assert 'env_ready = true' in response
+    assert 'env_use_default = true' in response
+
+    response = c.run_command('env info -p -d')
+    assert 'Default environment is used' in response
+    assert 'Environment cannot be persisted' in response
+
+    call('rm -f %s' % fs_img, shell=True)
-- 
2.17.1

  parent reply	other threads:[~2020-06-16  7:40 UTC|newest]

Thread overview: 27+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2020-06-16  7:40 [PATCH v2 0/9] env: ext4: corrections and add test for env in ext4 Patrick Delaunay
2020-06-16  7:40 ` [PATCH v2 1/9] env: add absolute path at CONFIG_ENV_EXT4_FILE Patrick Delaunay
2020-06-18 19:25   ` Tom Rini
2020-06-16  7:40 ` [PATCH v2 2/9] env: ext4: set gd->env_valid Patrick Delaunay
2020-06-18 19:25   ` Tom Rini
2020-06-16  7:40 ` [PATCH v2 3/9] env: correctly handle result in env_init Patrick Delaunay
2020-06-18 19:15   ` Tom Rini
2020-06-19 14:14     ` Patrick DELAUNAY
2020-06-19 18:05       ` Tom Rini
2020-06-23 13:13         ` Patrick DELAUNAY
2020-06-23 15:16           ` Tom Rini
2020-06-24 11:19             ` Patrick DELAUNAY
2020-06-24 18:07               ` Tom Rini
2020-06-16  7:40 ` [PATCH v2 4/9] sandbox: activate env in ext4 support Patrick Delaunay
2020-06-16  7:40 ` [PATCH v2 5/9] sandbox: support the change of env location Patrick Delaunay
2020-06-17  3:12   ` Simon Glass
2020-06-18 19:17   ` Tom Rini
2020-06-19 14:40     ` Patrick DELAUNAY
2020-06-19 18:07       ` Tom Rini
2020-06-16  7:40 ` Patrick Delaunay [this message]
2020-06-22 18:57   ` [PATCH v2 6/9] test: environment in ext4 Stephen Warren
2020-06-23 18:00     ` Patrick DELAUNAY
2020-06-16  7:40 ` [PATCH v2 7/9] env: ext4: introduce new function env_ext4_save_buffer Patrick Delaunay
2020-06-16  7:40 ` [PATCH v2 8/9] env: ext4: add support of command env erase Patrick Delaunay
2020-06-16  7:40 ` [PATCH v2 9/9] test: sandbox: add test for erase command Patrick Delaunay
2020-06-17  3:12   ` Simon Glass
2020-06-22 18:58   ` Stephen Warren

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20200616074048.7898-7-patrick.delaunay@st.com \
    --to=patrick.delaunay@st.com \
    --cc=u-boot@lists.denx.de \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox