diff options
Diffstat (limited to 'test/py/tests/test_fpga.py')
| -rw-r--r-- | test/py/tests/test_fpga.py | 278 |
1 files changed, 139 insertions, 139 deletions
diff --git a/test/py/tests/test_fpga.py b/test/py/tests/test_fpga.py index 460ff227f6f..7450b13945f 100644 --- a/test/py/tests/test_fpga.py +++ b/test/py/tests/test_fpga.py @@ -63,8 +63,8 @@ env__fpga_under_test = { import test_net -def check_dev(u_boot_console): - f = u_boot_console.config.env.get('env__fpga_under_test', None) +def check_dev(ubman): + f = ubman.config.env.get('env__fpga_under_test', None) if not f: pytest.skip('No FPGA to test') @@ -74,20 +74,20 @@ def check_dev(u_boot_console): return dev, f -def load_file_from_var(u_boot_console, name): - dev, f = check_dev(u_boot_console) +def load_file_from_var(ubman, name): + dev, f = check_dev(ubman) addr = f.get('addr', -1) if addr < 0: pytest.fail('No address specified via env__fpga_under_test') - test_net.test_net_dhcp(u_boot_console) - test_net.test_net_setup_static(u_boot_console) + test_net.test_net_dhcp(ubman) + test_net.test_net_setup_static(ubman) bit = f['%s' % (name)] bit_size = f['%s_size' % (name)] expected_tftp = 'Bytes transferred = %d' % bit_size - output = u_boot_console.run_command('tftpboot %x %s' % (addr, bit)) + output = ubman.run_command('tftpboot %x %s' % (addr, bit)) assert expected_tftp in output return f, dev, addr, bit, bit_size @@ -97,158 +97,158 @@ expected_usage = 'fpga - loadable FPGA image support' @pytest.mark.xfail @pytest.mark.buildconfigspec('cmd_fpga') -def test_fpga_fail(u_boot_console): +def test_fpga_fail(ubman): # Test non valid fpga subcommand expected = 'fpga: non existing command' - output = u_boot_console.run_command('fpga broken 0') + output = ubman.run_command('fpga broken 0') #assert expected in output assert expected_usage in output @pytest.mark.buildconfigspec('cmd_fpga') -def test_fpga_help(u_boot_console): +def test_fpga_help(ubman): # Just show help - output = u_boot_console.run_command('fpga') + output = ubman.run_command('fpga') assert expected_usage in output ###### FPGA DUMP tests ###### @pytest.mark.buildconfigspec('cmd_fpga') -def test_fpga_dump(u_boot_console): +def test_fpga_dump(ubman): pytest.skip('Not implemented now') @pytest.mark.buildconfigspec('cmd_fpga') -def test_fpga_dump_variable(u_boot_console): +def test_fpga_dump_variable(ubman): # Same as above but via "fpga" variable pytest.skip('Not implemented now') ###### FPGA INFO tests ###### @pytest.mark.buildconfigspec('cmd_fpga') -def test_fpga_info_fail(u_boot_console): +def test_fpga_info_fail(ubman): # Maybe this can be skipped completely - dev, f = check_dev(u_boot_console) + dev, f = check_dev(ubman) # Multiple parameters to fpga info should fail expected = 'fpga: more parameters passed' - output = u_boot_console.run_command('fpga info 0 0') + output = ubman.run_command('fpga info 0 0') #assert expected in output assert expected_usage in output @pytest.mark.buildconfigspec('cmd_fpga') -def test_fpga_info_list(u_boot_console): +def test_fpga_info_list(ubman): # Maybe this can be skipped completely - dev, f = check_dev(u_boot_console) + dev, f = check_dev(ubman) # Code is design in a way that if fpga dev is not passed it should # return list of all fpga devices in the system - u_boot_console.run_command('setenv fpga') - output = u_boot_console.run_command('fpga info') + ubman.run_command('setenv fpga') + output = ubman.run_command('fpga info') assert expected_usage not in output @pytest.mark.buildconfigspec('cmd_fpga') -def test_fpga_info(u_boot_console): - dev, f = check_dev(u_boot_console) +def test_fpga_info(ubman): + dev, f = check_dev(ubman) - output = u_boot_console.run_command('fpga info %x' % (dev)) + output = ubman.run_command('fpga info %x' % (dev)) assert expected_usage not in output @pytest.mark.buildconfigspec('cmd_fpga') -def test_fpga_info_variable(u_boot_console): - dev, f = check_dev(u_boot_console) +def test_fpga_info_variable(ubman): + dev, f = check_dev(ubman) # # fpga variable is storing device number which doesn't need to be passed # - u_boot_console.run_command('setenv fpga %x' % (dev)) + ubman.run_command('setenv fpga %x' % (dev)) - output = u_boot_console.run_command('fpga info') + output = ubman.run_command('fpga info') # Variable cleanup - u_boot_console.run_command('setenv fpga') + ubman.run_command('setenv fpga') assert expected_usage not in output ###### FPGA LOAD tests ###### @pytest.mark.buildconfigspec('cmd_fpga') @pytest.mark.buildconfigspec('cmd_echo') -def test_fpga_load_fail(u_boot_console): - f, dev, addr, bit, bit_size = load_file_from_var(u_boot_console, 'bitstream_load') +def test_fpga_load_fail(ubman): + f, dev, addr, bit, bit_size = load_file_from_var(ubman, 'bitstream_load') for cmd in ['dump', 'load', 'loadb']: # missing dev parameter expected = 'fpga: incorrect parameters passed' - output = u_boot_console.run_command('fpga %s %x $filesize' % (cmd, addr)) + output = ubman.run_command('fpga %s %x $filesize' % (cmd, addr)) #assert expected in output assert expected_usage in output # more parameters - 0 at the end expected = 'fpga: more parameters passed' - output = u_boot_console.run_command('fpga %s %x %x $filesize 0' % (cmd, dev, addr)) + output = ubman.run_command('fpga %s %x %x $filesize 0' % (cmd, dev, addr)) #assert expected in output assert expected_usage in output # 0 address expected = 'fpga: zero fpga_data address' - output = u_boot_console.run_command('fpga %s %x 0 $filesize' % (cmd, dev)) + output = ubman.run_command('fpga %s %x 0 $filesize' % (cmd, dev)) #assert expected in output assert expected_usage in output # 0 filesize expected = 'fpga: zero size' - output = u_boot_console.run_command('fpga %s %x %x 0' % (cmd, dev, addr)) + output = ubman.run_command('fpga %s %x %x 0' % (cmd, dev, addr)) #assert expected in output assert expected_usage in output @pytest.mark.buildconfigspec('cmd_fpga') @pytest.mark.buildconfigspec('cmd_echo') -def test_fpga_load(u_boot_console): - f, dev, addr, bit, bit_size = load_file_from_var(u_boot_console, 'bitstream_load') +def test_fpga_load(ubman): + f, dev, addr, bit, bit_size = load_file_from_var(ubman, 'bitstream_load') expected_text = 'FPGA loaded successfully' - output = u_boot_console.run_command('fpga load %x %x $filesize && echo %s' % (dev, addr, expected_text)) + output = ubman.run_command('fpga load %x %x $filesize && echo %s' % (dev, addr, expected_text)) assert expected_text in output @pytest.mark.buildconfigspec('cmd_fpga') @pytest.mark.buildconfigspec('cmd_fpga_loadp') @pytest.mark.buildconfigspec('cmd_echo') -def test_fpga_loadp(u_boot_console): - f, dev, addr, bit, bit_size = load_file_from_var(u_boot_console, 'bitstream_load') +def test_fpga_loadp(ubman): + f, dev, addr, bit, bit_size = load_file_from_var(ubman, 'bitstream_load') expected_text = 'FPGA loaded successfully' - output = u_boot_console.run_command('fpga load %x %x $filesize && echo %s' % (dev, addr, expected_text)) + output = ubman.run_command('fpga load %x %x $filesize && echo %s' % (dev, addr, expected_text)) assert expected_text in output # And load also partial bistream - f, dev, addr, bit, bit_size = load_file_from_var(u_boot_console, 'bitstream_loadp') + f, dev, addr, bit, bit_size = load_file_from_var(ubman, 'bitstream_loadp') expected_text = 'FPGA loaded successfully' - output = u_boot_console.run_command('fpga loadp %x %x $filesize && echo %s' % (dev, addr, expected_text)) + output = ubman.run_command('fpga loadp %x %x $filesize && echo %s' % (dev, addr, expected_text)) assert expected_text in output @pytest.mark.buildconfigspec('cmd_fpga') @pytest.mark.buildconfigspec('cmd_echo') -def test_fpga_loadb(u_boot_console): - f, dev, addr, bit, bit_size = load_file_from_var(u_boot_console, 'bitstream_loadb') +def test_fpga_loadb(ubman): + f, dev, addr, bit, bit_size = load_file_from_var(ubman, 'bitstream_loadb') expected_text = 'FPGA loaded successfully' - output = u_boot_console.run_command('fpga loadb %x %x $filesize && echo %s' % (dev, addr, expected_text)) + output = ubman.run_command('fpga loadb %x %x $filesize && echo %s' % (dev, addr, expected_text)) assert expected_text in output @pytest.mark.buildconfigspec('cmd_fpga') @pytest.mark.buildconfigspec('cmd_fpga_loadbp') @pytest.mark.buildconfigspec('cmd_echo') -def test_fpga_loadbp(u_boot_console): - f, dev, addr, bit, bit_size = load_file_from_var(u_boot_console, 'bitstream_loadb') +def test_fpga_loadbp(ubman): + f, dev, addr, bit, bit_size = load_file_from_var(ubman, 'bitstream_loadb') expected_text = 'FPGA loaded successfully' - output = u_boot_console.run_command('fpga loadb %x %x $filesize && echo %s' % (dev, addr, expected_text)) + output = ubman.run_command('fpga loadb %x %x $filesize && echo %s' % (dev, addr, expected_text)) assert expected_text in output # And load also partial bistream in bit format - f, dev, addr, bit, bit_size = load_file_from_var(u_boot_console, 'bitstream_loadbp') + f, dev, addr, bit, bit_size = load_file_from_var(ubman, 'bitstream_loadbp') expected_text = 'FPGA loaded successfully' - output = u_boot_console.run_command('fpga loadbp %x %x $filesize && echo %s' % (dev, addr, expected_text)) + output = ubman.run_command('fpga loadbp %x %x $filesize && echo %s' % (dev, addr, expected_text)) assert expected_text in output ###### FPGA LOADMK tests ###### @@ -257,18 +257,18 @@ def test_fpga_loadbp(u_boot_console): @pytest.mark.buildconfigspec('cmd_fpga_loadmk') @pytest.mark.buildconfigspec('cmd_echo') @pytest.mark.buildconfigspec('legacy_image_format') -def test_fpga_loadmk_fail(u_boot_console): - f, dev, addr, bit, bit_size = load_file_from_var(u_boot_console, 'mkimage_legacy') +def test_fpga_loadmk_fail(ubman): + f, dev, addr, bit, bit_size = load_file_from_var(ubman, 'mkimage_legacy') - u_boot_console.run_command('imi %x' % (addr)) + ubman.run_command('imi %x' % (addr)) # load image but pass incorrect address to show error message expected = 'Unknown image type' - output = u_boot_console.run_command('fpga loadmk %x %x' % (dev, addr + 0x10)) + output = ubman.run_command('fpga loadmk %x %x' % (dev, addr + 0x10)) assert expected in output # Pass more parameters then command expects - 0 at the end - output = u_boot_console.run_command('fpga loadmk %x %x 0' % (dev, addr)) + output = ubman.run_command('fpga loadmk %x %x 0' % (dev, addr)) #assert expected in output assert expected_usage in output @@ -276,13 +276,13 @@ def test_fpga_loadmk_fail(u_boot_console): @pytest.mark.buildconfigspec('cmd_fpga_loadmk') @pytest.mark.buildconfigspec('cmd_echo') @pytest.mark.buildconfigspec('legacy_image_format') -def test_fpga_loadmk_legacy(u_boot_console): - f, dev, addr, bit, bit_size = load_file_from_var(u_boot_console, 'mkimage_legacy') +def test_fpga_loadmk_legacy(ubman): + f, dev, addr, bit, bit_size = load_file_from_var(ubman, 'mkimage_legacy') - u_boot_console.run_command('imi %x' % (addr)) + ubman.run_command('imi %x' % (addr)) expected_text = 'FPGA loaded successfully' - output = u_boot_console.run_command('fpga loadmk %x %x && echo %s' % (dev, addr, expected_text)) + output = ubman.run_command('fpga loadmk %x %x && echo %s' % (dev, addr, expected_text)) assert expected_text in output @pytest.mark.xfail @@ -290,53 +290,53 @@ def test_fpga_loadmk_legacy(u_boot_console): @pytest.mark.buildconfigspec('cmd_fpga_loadmk') @pytest.mark.buildconfigspec('cmd_echo') @pytest.mark.buildconfigspec('legacy_image_format') -def test_fpga_loadmk_legacy_variable_fpga(u_boot_console): - f, dev, addr, bit, bit_size = load_file_from_var(u_boot_console, 'mkimage_legacy') +def test_fpga_loadmk_legacy_variable_fpga(ubman): + f, dev, addr, bit, bit_size = load_file_from_var(ubman, 'mkimage_legacy') - u_boot_console.run_command('imi %x' % (addr)) + ubman.run_command('imi %x' % (addr)) - u_boot_console.run_command('setenv fpga %x' % (dev)) + ubman.run_command('setenv fpga %x' % (dev)) # this testcase should cover case which looks like it is supported but dev pointer is broken by loading mkimage address expected_text = 'FPGA loaded successfully' - output = u_boot_console.run_command('fpga loadmk %x && echo %s' % (addr, expected_text)) - u_boot_console.run_command('setenv fpga') + output = ubman.run_command('fpga loadmk %x && echo %s' % (addr, expected_text)) + ubman.run_command('setenv fpga') assert expected_text in output @pytest.mark.buildconfigspec('cmd_fpga') @pytest.mark.buildconfigspec('cmd_fpga_loadmk') @pytest.mark.buildconfigspec('cmd_echo') @pytest.mark.buildconfigspec('legacy_image_format') -def test_fpga_loadmk_legacy_variable_fpgadata(u_boot_console): - f, dev, addr, bit, bit_size = load_file_from_var(u_boot_console, 'mkimage_legacy') +def test_fpga_loadmk_legacy_variable_fpgadata(ubman): + f, dev, addr, bit, bit_size = load_file_from_var(ubman, 'mkimage_legacy') - u_boot_console.run_command('imi %x' % (addr)) + ubman.run_command('imi %x' % (addr)) - u_boot_console.run_command('setenv fpgadata %x' % (addr)) + ubman.run_command('setenv fpgadata %x' % (addr)) # this testcase should cover case which looks like it is supported but dev pointer is broken by loading mkimage address expected_text = 'FPGA loaded successfully' - output = u_boot_console.run_command('fpga loadmk %x && echo %s' % (dev, expected_text)) - u_boot_console.run_command('setenv fpgadata') + output = ubman.run_command('fpga loadmk %x && echo %s' % (dev, expected_text)) + ubman.run_command('setenv fpgadata') assert expected_text in output @pytest.mark.buildconfigspec('cmd_fpga') @pytest.mark.buildconfigspec('cmd_fpga_loadmk') @pytest.mark.buildconfigspec('cmd_echo') @pytest.mark.buildconfigspec('legacy_image_format') -def test_fpga_loadmk_legacy_variable(u_boot_console): - f, dev, addr, bit, bit_size = load_file_from_var(u_boot_console, 'mkimage_legacy') +def test_fpga_loadmk_legacy_variable(ubman): + f, dev, addr, bit, bit_size = load_file_from_var(ubman, 'mkimage_legacy') - u_boot_console.run_command('imi %x' % (addr)) + ubman.run_command('imi %x' % (addr)) - u_boot_console.run_command('setenv fpga %x' % (dev)) - u_boot_console.run_command('setenv fpgadata %x' % (addr)) + ubman.run_command('setenv fpga %x' % (dev)) + ubman.run_command('setenv fpgadata %x' % (addr)) # this testcase should cover case which looks like it is supported but dev pointer is broken by loading mkimage address expected_text = 'FPGA loaded successfully' - output = u_boot_console.run_command('fpga loadmk && echo %s' % (expected_text)) - u_boot_console.run_command('setenv fpga') - u_boot_console.run_command('setenv fpgadata') + output = ubman.run_command('fpga loadmk && echo %s' % (expected_text)) + ubman.run_command('setenv fpga') + ubman.run_command('setenv fpgadata') assert expected_text in output @pytest.mark.buildconfigspec('cmd_fpga') @@ -344,96 +344,96 @@ def test_fpga_loadmk_legacy_variable(u_boot_console): @pytest.mark.buildconfigspec('cmd_echo') @pytest.mark.buildconfigspec('legacy_image_format') @pytest.mark.buildconfigspec('gzip') -def test_fpga_loadmk_legacy_gz(u_boot_console): - f, dev, addr, bit, bit_size = load_file_from_var(u_boot_console, 'mkimage_legacy_gz') +def test_fpga_loadmk_legacy_gz(ubman): + f, dev, addr, bit, bit_size = load_file_from_var(ubman, 'mkimage_legacy_gz') - u_boot_console.run_command('imi %x' % (addr)) + ubman.run_command('imi %x' % (addr)) expected_text = 'FPGA loaded successfully' - output = u_boot_console.run_command('fpga loadmk %x %x && echo %s' % (dev, addr, expected_text)) + output = ubman.run_command('fpga loadmk %x %x && echo %s' % (dev, addr, expected_text)) assert expected_text in output @pytest.mark.buildconfigspec('cmd_fpga') @pytest.mark.buildconfigspec('cmd_fpga_loadmk') @pytest.mark.buildconfigspec('fit') @pytest.mark.buildconfigspec('cmd_echo') -def test_fpga_loadmk_fit_external(u_boot_console): - f, dev, addr, bit, bit_size = load_file_from_var(u_boot_console, 'mkimage_fit_external') +def test_fpga_loadmk_fit_external(ubman): + f, dev, addr, bit, bit_size = load_file_from_var(ubman, 'mkimage_fit_external') - u_boot_console.run_command('imi %x' % (addr)) + ubman.run_command('imi %x' % (addr)) expected_text = 'FPGA loaded successfully' - output = u_boot_console.run_command('fpga loadmk %x %x:fpga && echo %s' % (dev, addr, expected_text)) + output = ubman.run_command('fpga loadmk %x %x:fpga && echo %s' % (dev, addr, expected_text)) assert expected_text in output @pytest.mark.buildconfigspec('cmd_fpga') @pytest.mark.buildconfigspec('cmd_fpga_loadmk') @pytest.mark.buildconfigspec('fit') @pytest.mark.buildconfigspec('cmd_echo') -def test_fpga_loadmk_fit(u_boot_console): - f, dev, addr, bit, bit_size = load_file_from_var(u_boot_console, 'mkimage_fit') +def test_fpga_loadmk_fit(ubman): + f, dev, addr, bit, bit_size = load_file_from_var(ubman, 'mkimage_fit') - u_boot_console.run_command('imi %x' % (addr)) + ubman.run_command('imi %x' % (addr)) expected_text = 'FPGA loaded successfully' - output = u_boot_console.run_command('fpga loadmk %x %x:fpga && echo %s' % (dev, addr, expected_text)) + output = ubman.run_command('fpga loadmk %x %x:fpga && echo %s' % (dev, addr, expected_text)) assert expected_text in output @pytest.mark.buildconfigspec('cmd_fpga') @pytest.mark.buildconfigspec('cmd_fpga_loadmk') @pytest.mark.buildconfigspec('fit') @pytest.mark.buildconfigspec('cmd_echo') -def test_fpga_loadmk_fit_variable_fpga(u_boot_console): - f, dev, addr, bit, bit_size = load_file_from_var(u_boot_console, 'mkimage_fit') +def test_fpga_loadmk_fit_variable_fpga(ubman): + f, dev, addr, bit, bit_size = load_file_from_var(ubman, 'mkimage_fit') - u_boot_console.run_command('imi %x' % (addr)) + ubman.run_command('imi %x' % (addr)) # FIXME this should fail - broken support in past - u_boot_console.run_command('setenv fpga %x' % (dev)) + ubman.run_command('setenv fpga %x' % (dev)) expected_text = 'FPGA loaded successfully' - output = u_boot_console.run_command('fpga loadmk %x:fpga && echo %s' % (addr, expected_text)) - u_boot_console.run_command('setenv fpga') + output = ubman.run_command('fpga loadmk %x:fpga && echo %s' % (addr, expected_text)) + ubman.run_command('setenv fpga') assert expected_text in output @pytest.mark.buildconfigspec('cmd_fpga') @pytest.mark.buildconfigspec('cmd_fpga_loadmk') @pytest.mark.buildconfigspec('fit') @pytest.mark.buildconfigspec('cmd_echo') -def test_fpga_loadmk_fit_variable_fpgadata(u_boot_console): - f, dev, addr, bit, bit_size = load_file_from_var(u_boot_console, 'mkimage_fit') +def test_fpga_loadmk_fit_variable_fpgadata(ubman): + f, dev, addr, bit, bit_size = load_file_from_var(ubman, 'mkimage_fit') - u_boot_console.run_command('imi %x' % (addr)) + ubman.run_command('imi %x' % (addr)) # FIXME this should fail - broken support in past - u_boot_console.run_command('setenv fpgadata %x:fpga' % (addr)) + ubman.run_command('setenv fpgadata %x:fpga' % (addr)) expected_text = 'FPGA loaded successfully' - output = u_boot_console.run_command('fpga loadmk %x && echo %s' % (dev, expected_text)) - u_boot_console.run_command('setenv fpgadata') + output = ubman.run_command('fpga loadmk %x && echo %s' % (dev, expected_text)) + ubman.run_command('setenv fpgadata') assert expected_text in output @pytest.mark.buildconfigspec('cmd_fpga') @pytest.mark.buildconfigspec('cmd_fpga_loadmk') @pytest.mark.buildconfigspec('fit') @pytest.mark.buildconfigspec('cmd_echo') -def test_fpga_loadmk_fit_variable(u_boot_console): - f, dev, addr, bit, bit_size = load_file_from_var(u_boot_console, 'mkimage_fit') +def test_fpga_loadmk_fit_variable(ubman): + f, dev, addr, bit, bit_size = load_file_from_var(ubman, 'mkimage_fit') - u_boot_console.run_command('imi %x' % (addr)) + ubman.run_command('imi %x' % (addr)) - u_boot_console.run_command('setenv fpga %x' % (dev)) - u_boot_console.run_command('setenv fpgadata %x:fpga' % (addr)) + ubman.run_command('setenv fpga %x' % (dev)) + ubman.run_command('setenv fpgadata %x:fpga' % (addr)) expected_text = 'FPGA loaded successfully' - output = u_boot_console.run_command('fpga loadmk && echo %s' % (expected_text)) - u_boot_console.run_command('setenv fpga') - u_boot_console.run_command('setenv fpgadata') + output = ubman.run_command('fpga loadmk && echo %s' % (expected_text)) + ubman.run_command('setenv fpga') + ubman.run_command('setenv fpgadata') assert expected_text in output ###### FPGA LOAD tests ###### @pytest.mark.buildconfigspec('cmd_fpga') -def test_fpga_loadfs_fail(u_boot_console): - dev, f = check_dev(u_boot_console) +def test_fpga_loadfs_fail(ubman): + dev, f = check_dev(ubman) addr = f.get('addr', -1) if addr < 0: @@ -445,49 +445,49 @@ def test_fpga_loadfs_fail(u_boot_console): # less params - dev number removed expected = 'fpga: incorrect parameters passed' - output = u_boot_console.run_command('fpga loadfs %x %x %x %s' % (addr, bit_size, block_size, bit)) + output = ubman.run_command('fpga loadfs %x %x %x %s' % (addr, bit_size, block_size, bit)) #assert expected in output assert expected_usage in output # one more param - 0 at the end # This is the longest command that's why there is no message from cmd/fpga.c - output = u_boot_console.run_command('fpga loadfs %x %x %x %x %s 0' % (dev, addr, bit_size, block_size, bit)) + output = ubman.run_command('fpga loadfs %x %x %x %x %s 0' % (dev, addr, bit_size, block_size, bit)) assert expected_usage in output # zero address 0 expected = 'fpga: zero fpga_data address' - output = u_boot_console.run_command('fpga loadfs %x %x %x %x %s' % (dev, 0, bit_size, block_size, bit)) + output = ubman.run_command('fpga loadfs %x %x %x %x %s' % (dev, 0, bit_size, block_size, bit)) #assert expected in output assert expected_usage in output # bit_size 0 expected = 'fpga: zero size' - output = u_boot_console.run_command('fpga loadfs %x %x %x %x %s' % (dev, addr, 0, block_size, bit)) + output = ubman.run_command('fpga loadfs %x %x %x %x %s' % (dev, addr, 0, block_size, bit)) #assert expected in output assert expected_usage in output # block size 0 # FIXME this should pass but it failing too - output = u_boot_console.run_command('fpga loadfs %x %x %x %x %s' % (dev, addr, bit_size, 0, bit)) + output = ubman.run_command('fpga loadfs %x %x %x %x %s' % (dev, addr, bit_size, 0, bit)) assert expected_usage in output # non existing bitstream name expected = 'Unable to read file noname' - output = u_boot_console.run_command('fpga loadfs %x %x %x %x mmc 0 noname' % (dev, addr, bit_size, block_size)) + output = ubman.run_command('fpga loadfs %x %x %x %x mmc 0 noname' % (dev, addr, bit_size, block_size)) assert expected in output assert expected_usage in output # -1 dev number expected = 'fpga_fsload: Invalid device number -1' - output = u_boot_console.run_command('fpga loadfs %d %x %x %x mmc 0 noname' % (-1, addr, bit_size, block_size)) + output = ubman.run_command('fpga loadfs %d %x %x %x mmc 0 noname' % (-1, addr, bit_size, block_size)) assert expected in output assert expected_usage in output @pytest.mark.buildconfigspec('cmd_fpga') @pytest.mark.buildconfigspec('cmd_echo') -def test_fpga_loadfs(u_boot_console): - dev, f = check_dev(u_boot_console) +def test_fpga_loadfs(ubman): + dev, f = check_dev(ubman) addr = f.get('addr', -1) if addr < 0: @@ -499,7 +499,7 @@ def test_fpga_loadfs(u_boot_console): # This should be done better expected_text = 'FPGA loaded successfully' - output = u_boot_console.run_command('fpga loadfs %x %x %x %x %s && echo %s' % (dev, addr, bit_size, block_size, bit, expected_text)) + output = ubman.run_command('fpga loadfs %x %x %x %x %s && echo %s' % (dev, addr, bit_size, block_size, bit, expected_text)) assert expected_text in output @pytest.mark.buildconfigspec('cmd_fpga') @@ -507,26 +507,26 @@ def test_fpga_loadfs(u_boot_console): @pytest.mark.buildconfigspec('cmd_net') @pytest.mark.buildconfigspec('cmd_dhcp') @pytest.mark.buildconfigspec('net') -def test_fpga_secure_bit_auth(u_boot_console): +def test_fpga_secure_bit_auth(ubman): - test_net.test_net_dhcp(u_boot_console) - test_net.test_net_setup_static(u_boot_console) + test_net.test_net_dhcp(ubman) + test_net.test_net_setup_static(ubman) - f = u_boot_console.config.env.get('env__fpga_secure_readable_file', None) + f = ubman.config.env.get('env__fpga_secure_readable_file', None) if not f: pytest.skip('No TFTP readable file to read') addr = f.get('addr', None) if not addr: - addr = u_boot_utils.find_ram_base(u_boot_console) + addr = u_boot_utils.find_ram_base(ubman) expected_tftp = 'Bytes transferred = ' fn = f['fn'] - output = u_boot_console.run_command('tftpboot %x %s' % (addr, fn)) + output = ubman.run_command('tftpboot %x %s' % (addr, fn)) assert expected_tftp in output expected_zynqmpsecure = 'Bitstream successfully loaded' - output = u_boot_console.run_command('fpga loads 0 %x $filesize 0 2' % (addr)) + output = ubman.run_command('fpga loads 0 %x $filesize 0 2' % (addr)) assert expected_zynqmpsecure in output @@ -535,31 +535,31 @@ def test_fpga_secure_bit_auth(u_boot_console): @pytest.mark.buildconfigspec('cmd_net') @pytest.mark.buildconfigspec('cmd_dhcp') @pytest.mark.buildconfigspec('net') -def test_fpga_secure_bit_img_auth_kup(u_boot_console): +def test_fpga_secure_bit_img_auth_kup(ubman): - test_net.test_net_dhcp(u_boot_console) - test_net.test_net_setup_static(u_boot_console) + test_net.test_net_dhcp(ubman) + test_net.test_net_setup_static(ubman) - f = u_boot_console.config.env.get('env__fpga_secure_readable_file', None) + f = ubman.config.env.get('env__fpga_secure_readable_file', None) if not f: pytest.skip('No TFTP readable file to read') keyaddr = f.get('keyaddr', None) if not keyaddr: - addr = u_boot_utils.find_ram_base(u_boot_console) + addr = u_boot_utils.find_ram_base(ubman) expected_tftp = 'Bytes transferred = ' keyfn = f['keyfn'] - output = u_boot_console.run_command('tftpboot %x %s' % (keyaddr, keyfn)) + output = ubman.run_command('tftpboot %x %s' % (keyaddr, keyfn)) assert expected_tftp in output addr = f.get('addr', None) if not addr: - addr = u_boot_utils.find_ram_base(u_boot_console) + addr = u_boot_utils.find_ram_base(ubman) expected_tftp = 'Bytes transferred = ' fn = f['enckupfn'] - output = u_boot_console.run_command('tftpboot %x %s' % (addr, fn)) + output = ubman.run_command('tftpboot %x %s' % (addr, fn)) assert expected_tftp in output expected_zynqmpsecure = 'Bitstream successfully loaded' - output = u_boot_console.run_command('fpga loads 0 %x $filesize 0 1 %x' % (addr, keyaddr)) + output = ubman.run_command('fpga loads 0 %x $filesize 0 1 %x' % (addr, keyaddr)) assert expected_zynqmpsecure in output |