[Buildroot] [PATCH 1/2] support/testing: test_zfs: don't run TestZfsBase as a test

Romain Naour romain.naour at gmail.com
Thu May 12 21:49:04 UTC 2022


The commit [1] introcuded TestZfsBase as a common function
between all Zfs tests. But TestZfsBase test is executed
as a test itself.

Rename test_run() to base_test_run() to avoid this issue.

Fixes:
https://gitlab.com/buildroot.org/buildroot/-/jobs/2429014006

[1] 593e8cb71f8f2ac69889424bbef5ab09c0dbb06e

Signed-off-by: Romain Naour <romain.naour at gmail.com>
Cc: José Luis Salvador Rufo <salvador.joseluis at gmail.com>
---
 support/testing/tests/package/test_zfs.py | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/support/testing/tests/package/test_zfs.py b/support/testing/tests/package/test_zfs.py
index 8911dcfd9e..e3784f7d7d 100644
--- a/support/testing/tests/package/test_zfs.py
+++ b/support/testing/tests/package/test_zfs.py
@@ -25,7 +25,7 @@ class TestZfsBase(infra.basetest.BRTest):
         # BR2_TARGET_ROOTFS_TAR is not set
         """
 
-    def test_run(self):
+    def base_test_run(self):
         kernel = os.path.join(self.builddir, "images", "bzImage")
         cpio_file = os.path.join(self.builddir, "images", "rootfs.cpio")
         self.emulator.boot(
@@ -65,6 +65,9 @@ class TestZfsGlibc(TestZfsBase):
         BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_X86_64_CORE_I7_GLIBC_STABLE=y
         """
 
+    def test_run(self):
+        TestZfsBase.base_test_run(self)
+
 
 class TestZfsUclibc(TestZfsBase):
     config = TestZfsBase.config + \
@@ -72,9 +75,15 @@ class TestZfsUclibc(TestZfsBase):
         BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_X86_64_CORE_I7_UCLIBC_STABLE=y
         """
 
+    def test_run(self):
+        TestZfsBase.base_test_run(self)
+
 
 class TestZfsMusl(TestZfsBase):
     config = TestZfsBase.config + \
         """
         BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_X86_64_MUSL_STABLE=y
         """
+
+    def test_run(self):
+        TestZfsBase.base_test_run(self)
-- 
2.35.1




More information about the buildroot mailing list