test/py: Drop u_boot_ prefix on test files
We know this is U-Boot so the prefix serves no purpose other than to make things longer and harder to read. Drop it and rename the files. Signed-off-by: Simon Glass <sjg@chromium.org> Reviewed-by: Mattijs Korpershoek <mkorpershoek@baylibre.com> # test_android / test_dfu
This commit is contained in:
@@ -5,7 +5,7 @@
|
||||
|
||||
import os
|
||||
import pytest
|
||||
import u_boot_utils
|
||||
import utils
|
||||
|
||||
class ABTestDiskImage(object):
|
||||
"""Disk Image used by the A/B tests."""
|
||||
@@ -25,7 +25,7 @@ class ABTestDiskImage(object):
|
||||
persistent = ubman.config.persistent_data_dir + '/' + filename
|
||||
self.path = ubman.config.result_dir + '/' + filename
|
||||
|
||||
with u_boot_utils.persistent_file_helper(ubman.log, persistent):
|
||||
with utils.persistent_file_helper(ubman.log, persistent):
|
||||
if os.path.exists(persistent):
|
||||
ubman.log.action('Disk image file ' + persistent +
|
||||
' already exists')
|
||||
@@ -35,16 +35,16 @@ class ABTestDiskImage(object):
|
||||
os.ftruncate(fd, 524288)
|
||||
os.close(fd)
|
||||
cmd = ('sgdisk', persistent)
|
||||
u_boot_utils.run_and_log(ubman, cmd)
|
||||
utils.run_and_log(ubman, cmd)
|
||||
|
||||
cmd = ('sgdisk', '--new=1:64:512', '--change-name=1:misc',
|
||||
persistent)
|
||||
u_boot_utils.run_and_log(ubman, cmd)
|
||||
utils.run_and_log(ubman, cmd)
|
||||
cmd = ('sgdisk', '--load-backup=' + persistent)
|
||||
u_boot_utils.run_and_log(ubman, cmd)
|
||||
utils.run_and_log(ubman, cmd)
|
||||
|
||||
cmd = ('cp', persistent, self.path)
|
||||
u_boot_utils.run_and_log(ubman, cmd)
|
||||
utils.run_and_log(ubman, cmd)
|
||||
|
||||
di = None
|
||||
@pytest.fixture(scope='function')
|
||||
|
||||
@@ -6,7 +6,7 @@
|
||||
|
||||
import os
|
||||
import pytest
|
||||
import u_boot_utils
|
||||
import utils
|
||||
|
||||
"""
|
||||
These tests rely on disk image (boot.img), which is automatically created by
|
||||
@@ -122,7 +122,7 @@ class AbootimgTestDiskImage(object):
|
||||
persistent = ubman.config.persistent_data_dir + '/' + filename
|
||||
self.path = ubman.config.result_dir + '/' + filename
|
||||
ubman.log.action('persistent is ' + persistent)
|
||||
with u_boot_utils.persistent_file_helper(ubman.log, persistent):
|
||||
with utils.persistent_file_helper(ubman.log, persistent):
|
||||
if os.path.exists(persistent):
|
||||
ubman.log.action('Disk image file ' + persistent +
|
||||
' already exists')
|
||||
@@ -133,12 +133,12 @@ class AbootimgTestDiskImage(object):
|
||||
f.write(hex_img)
|
||||
f.close()
|
||||
cmd = ('xxd', '-r', '-p', gz_hex, gz)
|
||||
u_boot_utils.run_and_log(ubman, cmd)
|
||||
utils.run_and_log(ubman, cmd)
|
||||
cmd = ('gunzip', '-9', gz)
|
||||
u_boot_utils.run_and_log(ubman, cmd)
|
||||
utils.run_and_log(ubman, cmd)
|
||||
|
||||
cmd = ('cp', persistent, self.path)
|
||||
u_boot_utils.run_and_log(ubman, cmd)
|
||||
utils.run_and_log(ubman, cmd)
|
||||
|
||||
gtdi1 = None
|
||||
@pytest.fixture(scope='function')
|
||||
|
||||
@@ -15,7 +15,7 @@ For configuration verification:
|
||||
"""
|
||||
|
||||
import pytest
|
||||
import u_boot_utils as util
|
||||
import utils as util
|
||||
|
||||
# defauld mmc id
|
||||
mmc_dev = 1
|
||||
|
||||
Reference in New Issue
Block a user