summaryrefslogtreecommitdiff
path: root/test/py/make_test_disk.py
diff options
context:
space:
mode:
authorStephen Warren <swarren@nvidia.com>2017-09-15 12:19:38 -0600
committerTom Rini <trini@konsulko.com>2017-09-15 22:33:41 -0400
commit110ba62519909df7042cbe71824dfe3844557a85 (patch)
tree17758905616cb5de19d1667806512e2ae19e27dd /test/py/make_test_disk.py
parent079c92b0a77b9a9bf237a9430ed16cf81d43ce5d (diff)
test/py: gpt: make use of infra-structure
Make various changes to the GPT test: 1) Reference the disk image using an absolute path in all cases. This allows test/py to operate correctly if it's run from a directory other than the root of the U-Boot source tree. 2) Store the disk image in the teswt/py persistent data directory. This removes the need to re-generate it every time the tests are run. 3) Execute sgdisk using u_boot_utils.run_and_log() so that its output is captured in the test log. This allows debugging any problems running it. 4) Make the disk image a test fixture. This removes the requirement to always run all GPT tests, and run them in order. The current code doesn't create the disk image if e.g. just test_gpt_uuid() is executed via the test.py -k command-line option. 5) Use @pytest.mark.buildconfigspec for all feature dependencies, rather than manually implementing some of them. 6) Make all tests depend on sandbox, since they use the sandbox-specific host command. Fixes: a2f422555fc8 ("add pytests for 'gpt guid' command in sandbox") Fixes: c5772188ede9 ("add pytests for 'gpt rename' and 'gpt swap'") Signed-off-by: Stephen Warren <swarren@nvidia.com> Tested-by: Tom Rini <trini@konsulko.com>
Diffstat (limited to 'test/py/make_test_disk.py')
-rwxr-xr-xtest/py/make_test_disk.py19
1 files changed, 0 insertions, 19 deletions
diff --git a/test/py/make_test_disk.py b/test/py/make_test_disk.py
deleted file mode 100755
index 5288295588a..00000000000
--- a/test/py/make_test_disk.py
+++ /dev/null
@@ -1,19 +0,0 @@
-# Copyright (c) 2017 Alison Chaiken
-#
-# SPDX-License-Identifier: GPL-2.0
-#
-# Create a block device for testing of 'gpt' and 'part' commands.
-
-import os
-
-def makeDisk():
- if (os.path.exists("testdisk.raw")):
- os.remove("testdisk.raw")
- fd = os.open("testdisk.raw", os.O_RDWR|os.O_CREAT )
- os.ftruncate(fd, 4194304)
- os.close(fd)
- os.spawnl(os.P_WAIT, "/sbin/sgdisk", "sgdisk", "-U",
- "375a56f7-d6c9-4e81-b5f0-09d41ca89efe", "testdisk.raw")
- os.spawnl(os.P_WAIT, "/sbin/sgdisk", "sgdisk", "--new=1:2048:2560", "testdisk.raw")
- os.spawnl(os.P_WAIT, "/sbin/sgdisk", "sgdisk", "--new=2:4096:4608", "testdisk.raw")
- os.spawnl(os.P_WAIT, "/sbin/gdisk", "sgdisk", "-l", "testdisk.raw")