From d22f7ad86a3edfbfadbdfc11c754a4de5445ab39 Mon Sep 17 00:00:00 2001 From: Marek Vasut Date: Wed, 13 Mar 2019 17:49:25 +0100 Subject: [PATCH] test/py: mmc: Factor out device selection Factor out the 'mmc dev' call so it can be recycled by other tests. Signed-off-by: Marek Vasut Cc: Tom Rini Cc: Simon Glass Reviewed-by: Simon Glass --- test/py/tests/test_mmc_rd.py | 38 +++++++++++++++++++++++++----------- 1 file changed, 27 insertions(+), 11 deletions(-) diff --git a/test/py/tests/test_mmc_rd.py b/test/py/tests/test_mmc_rd.py index a13bc0a5f6..40ae1a8459 100644 --- a/test/py/tests/test_mmc_rd.py +++ b/test/py/tests/test_mmc_rd.py @@ -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: -- 2.39.5