test/py: mmc: Factor out device selection
PATCH 1/5 test/py: mmc: Factor out device selection
Factor out the 'mmc dev' call so it can be recycled by other tests.
--- test/py/tests/test_mmc_rd.py | 38 +++++++++++++++++++++++++----------- 1 file changed, 27 insertions(+), 11 deletions(-)
test/py/tests/test_mmc_rd.py +27 -11
@@ -57,6 +57,32 @@ env__mmc_rd_configs = ( ) """ +def mmc_dev(u_boot_console, is_emmc, devid, partid): + """Run the "mmc dev" command. + + Args: + u_boot_console: A U-Boot console connection. + is_emmc: Whether the device is eMMC + devid: Device ID + partid: Partition ID + + Returns: + Nothing. + """ + + # Select MMC device + cmd = 'mmc dev %d' % devid + if is_emmc: + cmd += ' %d' % partid + response = u_boot_console.run_command(cmd) + assert 'no card present' not in response + if is_emmc: + partid_response = '(part %d)' % partid + else: + partid_response = '' + good_response = 'mmc%d%s is current device' % (devid, partid_response) + assert good_response in response + @pytest.mark.buildconfigspec('cmd_mmc') def test_mmc_rd(u_boot_console, env__mmc_rd_config): """Test the "mmc read" command.
@@ -86,17 +112,7 @@ def test_mmc_rd(u_boot_console, env__mmc_rd_config): addr = '0x%08x' % ram_base # Select MMC device - cmd = 'mmc dev %d' % devid - if is_emmc: - cmd += ' %d' % partid - response = u_boot_console.run_command(cmd) - assert 'no card present' not in response - if is_emmc: - partid_response = '(part %d)' % partid - else: - partid_response = '' - good_response = 'mmc%d%s is current device' % (devid, partid_response) - assert good_response in response + mmc_dev(u_boot_console, is_emmc, devid, partid) # Clear target RAM if expected_crc32:
Signature · 1 line
2.20.1
PATCH 2/5 test/py: mmc: Add 'mmc dev' test
Add separate test for 'mmc dev' subcommand. This tests whether the system can switch to a specific card.
--- test/py/tests/test_mmc_rd.py | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+)
test/py/tests/test_mmc_rd.py +21 -0
@@ -83,6 +83,27 @@ def mmc_dev(u_boot_console, is_emmc, devid, partid): good_response = 'mmc%d%s is current device' % (devid, partid_response) assert good_response in response + at pytest.mark.buildconfigspec('cmd_mmc') +def test_mmc_dev(u_boot_console, env__mmc_rd_config): + """Test the "mmc dev" command. + + Args: + u_boot_console: A U-Boot console connection. + env__mmc_rd_config: The single MMC configuration on which + to run the test. See the file-level comment above for details + of the format. + + Returns: + Nothing. + """ + + is_emmc = env__mmc_rd_config['is_emmc'] + devid = env__mmc_rd_config['devid'] + partid = env__mmc_rd_config.get('partid', 0) + + # Select MMC device + mmc_dev(u_boot_console, is_emmc, devid, partid) + @pytest.mark.buildconfigspec('cmd_mmc') def test_mmc_rd(u_boot_console, env__mmc_rd_config): """Test the "mmc read" command.
Signature · 1 line
2.20.1
PATCH 2/5 test/py: mmc: Add 'mmc dev' test
Quoted 10 lines · Marek Vasut
Add separate test for 'mmc dev' subcommand. This tests whether the system can switch to a specific card.
Signed-off-by Marek Vasut <[email protected]>Cc Tom Rini <[email protected]>Cc Simon Glass <[email protected]>--- test/py/tests/test_mmc_rd.py | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+)
PATCH 2/5 test/py: mmc: Add 'mmc dev' test
In reply to Marek VasutQuoted 7 lines · Marek Vasut
Add separate test for 'mmc dev' subcommand. This tests whether the system can switch to a specific card.
Signed-off-by Marek Vasut <[email protected]>Cc Tom Rini <[email protected]>Cc Simon Glass <[email protected]>Reviewed-by Simon Glass <[email protected]>
Applied to u-boot/master, thanks!
Signature · 8 lines
Tom -------------- next part -------------- A non-text attachment was scrubbed... Name: signature.asc Type: application/pgp-signature Size: 819 bytes Desc: not available URL: <http://lists.denx.de/pipermail/u-boot/attachments/20190410/12c793e6/attachment.sig>
PATCH 3/5 test/py: mmc: Add 'mmc rescan' test
In reply to Marek VasutAdd test for 'mmc rescan' subcommand. This tests whether the system can switch to a specific card and then rescan the card.
--- test/py/tests/test_mmc_rd.py | 26 ++++++++++++++++++++++++++ 1 file changed, 26 insertions(+)
test/py/tests/test_mmc_rd.py +26 -0
@@ -104,6 +104,32 @@ def test_mmc_dev(u_boot_console, env__mmc_rd_config): # Select MMC device mmc_dev(u_boot_console, is_emmc, devid, partid) + at pytest.mark.buildconfigspec('cmd_mmc') +def test_mmc_rescan(u_boot_console, env__mmc_rd_config): + """Test the "mmc rescan" command. + + Args: + u_boot_console: A U-Boot console connection. + env__mmc_rd_config: The single MMC configuration on which + to run the test. See the file-level comment above for details + of the format. + + Returns: + Nothing. + """ + + is_emmc = env__mmc_rd_config['is_emmc'] + devid = env__mmc_rd_config['devid'] + partid = env__mmc_rd_config.get('partid', 0) + + # Select MMC device + mmc_dev(u_boot_console, is_emmc, devid, partid) + + # Rescan MMC device + cmd = 'mmc rescan' + response = u_boot_console.run_command(cmd) + assert 'no card present' not in response + @pytest.mark.buildconfigspec('cmd_mmc') def test_mmc_rd(u_boot_console, env__mmc_rd_config): """Test the "mmc read" command.
Signature · 1 line
2.20.1
PATCH 3/5 test/py: mmc: Add 'mmc rescan' test
Quoted 10 lines · Marek Vasut
Add test for 'mmc rescan' subcommand. This tests whether the system can switch to a specific card and then rescan the card.
Signed-off-by Marek Vasut <[email protected]>Cc Tom Rini <[email protected]>Cc Simon Glass <[email protected]>--- test/py/tests/test_mmc_rd.py | 26 ++++++++++++++++++++++++++ 1 file changed, 26 insertions(+)
PATCH 3/5 test/py: mmc: Add 'mmc rescan' test
In reply to Marek VasutQuoted 7 lines · Marek Vasut
Add test for 'mmc rescan' subcommand. This tests whether the system can switch to a specific card and then rescan the card.
Signed-off-by Marek Vasut <[email protected]>Cc Tom Rini <[email protected]>Cc Simon Glass <[email protected]>Reviewed-by Simon Glass <[email protected]>
Applied to u-boot/master, thanks!
Signature · 8 lines
Tom -------------- next part -------------- A non-text attachment was scrubbed... Name: signature.asc Type: application/pgp-signature Size: 819 bytes Desc: not available URL: <http://lists.denx.de/pipermail/u-boot/attachments/20190410/1ac85218/attachment.sig>
PATCH 4/5 test/py: mmc: Add 'mmc info' test
In reply to Marek VasutAdd test for 'mmc info' subcommand. This tests whether the card information is obtained correctly and verifies the device, bus speed, bus mode and bus width.
--- test/py/tests/test_mmc_rd.py | 37 ++++++++++++++++++++++++++++++++++++ 1 file changed, 37 insertions(+)
test/py/tests/test_mmc_rd.py +37 -0
@@ -130,6 +130,43 @@ def test_mmc_rescan(u_boot_console, env__mmc_rd_config): response = u_boot_console.run_command(cmd) assert 'no card present' not in response + at pytest.mark.buildconfigspec('cmd_mmc') +def test_mmc_info(u_boot_console, env__mmc_rd_config): + """Test the "mmc info" command. + + Args: + u_boot_console: A U-Boot console connection. + env__mmc_rd_config: The single MMC configuration on which + to run the test. See the file-level comment above for details + of the format. + + Returns: + Nothing. + """ + + is_emmc = env__mmc_rd_config['is_emmc'] + devid = env__mmc_rd_config['devid'] + partid = env__mmc_rd_config.get('partid', 0) + info_device = env__mmc_rd_config['info_device'] + info_speed = env__mmc_rd_config['info_speed'] + info_mode = env__mmc_rd_config['info_mode'] + info_buswidth = env__mmc_rd_config['info_buswidth'] + + # Select MMC device + mmc_dev(u_boot_console, is_emmc, devid, partid) + + # Read MMC device information + cmd = 'mmc info' + response = u_boot_console.run_command(cmd) + good_response = "Device: %s" % info_device + assert good_response in response + good_response = "Bus Speed: %s" % info_speed + assert good_response in response + good_response = "Mode : %s" % info_mode + assert good_response in response + good_response = "Bus Width: %s" % info_buswidth + assert good_response in response + @pytest.mark.buildconfigspec('cmd_mmc') def test_mmc_rd(u_boot_console, env__mmc_rd_config): """Test the "mmc read" command.
Signature · 1 line
2.20.1
PATCH 4/5 test/py: mmc: Add 'mmc info' test
Quoted 11 lines · Marek Vasut
Add test for 'mmc info' subcommand. This tests whether the card information is obtained correctly and verifies the device, bus speed, bus mode and bus width.
Signed-off-by Marek Vasut <[email protected]>Cc Tom Rini <[email protected]>Cc Simon Glass <[email protected]>--- test/py/tests/test_mmc_rd.py | 37 ++++++++++++++++++++++++++++++++++++ 1 file changed, 37 insertions(+)
PATCH 4/5 test/py: mmc: Add 'mmc info' test
In reply to Marek VasutQuoted 8 lines · Marek Vasut
Add test for 'mmc info' subcommand. This tests whether the card information is obtained correctly and verifies the device, bus speed, bus mode and bus width.
Signed-off-by Marek Vasut <[email protected]>Cc Tom Rini <[email protected]>Cc Simon Glass <[email protected]>Reviewed-by Simon Glass <[email protected]>
Applied to u-boot/master, thanks!
Signature · 8 lines
Tom -------------- next part -------------- A non-text attachment was scrubbed... Name: signature.asc Type: application/pgp-signature Size: 819 bytes Desc: not available URL: <http://lists.denx.de/pipermail/u-boot/attachments/20190410/e8628fd7/attachment.sig>
PATCH 5/5 test/py: mmc: Add 'mmc read' performance check
In reply to Marek VasutAdd option to the mmc rd test to check the duration of the execution of the mmc read command. This allows intercepting read performance regressions.
--- test/py/tests/test_mmc_rd.py | 11 +++++++++++ 1 file changed, 11 insertions(+)
test/py/tests/test_mmc_rd.py +11 -0
@@ -6,6 +6,7 @@ # read if the test configuration contains a CRC of the expected data. import pytest +import time import u_boot_utils """
@@ -187,6 +188,7 @@ def test_mmc_rd(u_boot_console, env__mmc_rd_config): sector = env__mmc_rd_config.get('sector', 0) count_sectors = env__mmc_rd_config.get('count', 1) expected_crc32 = env__mmc_rd_config.get('crc32', None) + read_duration_max = env__mmc_rd_config.get('read_duration_max', 0) count_bytes = count_sectors * 512 bcfg = u_boot_console.config.buildconfig
@@ -213,7 +215,9 @@ def test_mmc_rd(u_boot_console, env__mmc_rd_config): # Read data cmd = 'mmc read %s %x %x' % (addr, sector, count_sectors) + tstart = time.time() response = u_boot_console.run_command(cmd) + tend = time.time() good_response = 'MMC read: dev # %d, block # %d, count %d ... %d blocks read: OK' % ( devid, sector, count_sectors, count_sectors) assert good_response in response
@@ -226,3 +230,10 @@ def test_mmc_rd(u_boot_console, env__mmc_rd_config): assert expected_crc32 in response else: u_boot_console.log.warning('CONFIG_CMD_CRC32 != y: Skipping check') + + # Check if the command did not take too long + if read_duration_max: + elapsed = tend - tstart + u_boot_console.log.info('Reading %d bytes took %f seconds' % + (count_bytes, elapsed)) + assert elapsed <= (read_duration_max - 0.01)
Signature · 1 line
2.20.1
PATCH 5/5 test/py: mmc: Add 'mmc read' performance check
Quoted 5 lines · Marek Vasut
Add option to the mmc rd test to check the duration of the execution of the mmc read command. This allows intercepting read performance regressions.
Quoted 7 lines
Signed-off-by Marek Vasut <[email protected]>Cc Tom Rini <[email protected]>Cc Simon Glass <[email protected]>--- test/py/tests/test_mmc_rd.py | 11 +++++++++++ 1 file changed, 11 insertions(+)
PATCH 5/5 test/py: mmc: Add 'mmc read' performance check
In reply to Marek VasutQuoted 8 lines · Marek Vasut
Add option to the mmc rd test to check the duration of the execution of the mmc read command. This allows intercepting read performance regressions.
Signed-off-by Marek Vasut <[email protected]>Cc Tom Rini <[email protected]>Cc Simon Glass <[email protected]>Reviewed-by Simon Glass <[email protected]>
Applied to u-boot/master, thanks!
Signature · 8 lines
Tom -------------- next part -------------- A non-text attachment was scrubbed... Name: signature.asc Type: application/pgp-signature Size: 819 bytes Desc: not available URL: <http://lists.denx.de/pipermail/u-boot/attachments/20190410/31257ca9/attachment.sig>
PATCH 1/5 test/py: mmc: Factor out device selection
In reply to Marek VasutQuoted 9 lines · Marek Vasut
Factor out the 'mmc dev' call so it can be recycled by other tests.
Signed-off-by Marek Vasut <[email protected]>Cc Tom Rini <[email protected]>Cc Simon Glass <[email protected]>--- test/py/tests/test_mmc_rd.py | 38 +++++++++++++++++++++++++----------- 1 file changed, 27 insertions(+), 11 deletions(-)
PATCH 1/5 test/py: mmc: Factor out device selection
In reply to Marek VasutQuoted 6 lines · Marek Vasut
Factor out the 'mmc dev' call so it can be recycled by other tests.
Signed-off-by Marek Vasut <[email protected]>Cc Tom Rini <[email protected]>Cc Simon Glass <[email protected]>Reviewed-by Simon Glass <[email protected]>
Applied to u-boot/master, thanks!
Signature · 8 lines
Tom -------------- next part -------------- A non-text attachment was scrubbed... Name: signature.asc Type: application/pgp-signature Size: 819 bytes Desc: not available URL: <http://lists.denx.de/pipermail/u-boot/attachments/20190410/acc910a9/attachment.sig>