From f5677185e68f48de3d4a6410b32df3945b0e833c Mon Sep 17 00:00:00 2001
From: sherlock2010 <15151851377@163.com>
Date: Thu, 28 Sep 2023 07:39:12 +0000
Subject: [PATCH] enable test

---
 blivet-gui.spec                          | 15 +++++++-
 skip-brtfs-raid-test-if-no-support.patch | 44 ++++++++++++++++++++++++
 2 files changed, 58 insertions(+), 1 deletion(-)
 create mode 100644 skip-brtfs-raid-test-if-no-support.patch

diff --git a/blivet-gui.spec b/blivet-gui.spec
index 8acceed..006bc69 100644
--- a/blivet-gui.spec
+++ b/blivet-gui.spec
@@ -1,14 +1,18 @@
 Name:            blivet-gui
 Version:         2.4.1
-Release:         1
+Release:         2
 Summary:         Tool for data storage configuration
 License:         GPL-2.0-or-later
 URL:             https://github.com/storaged-project/blivet-gui
 Source0:         https://github.com/storaged-project/blivet-gui/releases/download/%{version}/%{name}-%{version}.tar.gz
 Source1:         blivet-gui_event.conf
 
+Patch0:          skip-brtfs-raid-test-if-no-support.patch
+
 BuildArch:       noarch
 BuildRequires:   desktop-file-utils libappstream-glib python3-devel gettext >= 0.18.3 python3-setuptools make
+#required by test
+BuildRequires:   python3-six python3-gobject-base python3-blivet xorg-x11-server-Xvfb
 
 Requires:        python3 python3-gobject polkit python3-blivet gtk3
 Requires:        PolicyKit-authentication-agent python3-pid libreport
@@ -37,6 +41,9 @@ mkdir -p %{buildroot}/%{_sysconfdir}/libreport/events.d/
 install -m644 %{SOURCE1} %{buildroot}/%{_sysconfdir}/libreport/events.d/
 install -d %{buildroot}/%{_localstatedir}/log/blivet-gui
 
+%check
+make test
+
 %files
 %defattr(-,root,root)
 %doc COPYING
@@ -57,6 +64,12 @@ install -d %{buildroot}/%{_localstatedir}/log/blivet-gui
 %{_mandir}/man1/blivet-gui.1*
 
 %changelog
+* Thu Sep 28 2023 zhouyihang<zhouyihang3@h-partners.com> - 2.4.1-2
+- Type:requirements
+- CVE:NA
+- SUG:NA
+- DESC:enable test
+
 * Sat Jul 22 2023 zhouyihang<zhouyihang3@h-partners.com> - 2.4.1-1
 - Type:requirements
 - CVE:NA
diff --git a/skip-brtfs-raid-test-if-no-support.patch b/skip-brtfs-raid-test-if-no-support.patch
new file mode 100644
index 0000000..21dc59b
--- /dev/null
+++ b/skip-brtfs-raid-test-if-no-support.patch
@@ -0,0 +1,44 @@
+From 0286e1f0c2a1986c323b9c6a68dc6e106dcebd26 Mon Sep 17 00:00:00 2001
+From: zhouyihang <zhouyihang3@h-partners.com>
+Date: Thu, 28 Sep 2023 11:14:18 +0800
+Subject: [PATCH] skip brtfs raid test if no support
+
+---
+ tests/blivetgui_tests/add_dialog_test.py | 7 +++++++
+ 1 file changed, 7 insertions(+)
+
+diff --git a/tests/blivetgui_tests/add_dialog_test.py b/tests/blivetgui_tests/add_dialog_test.py
+index 93d89ec..dd9ff09 100644
+--- a/tests/blivetgui_tests/add_dialog_test.py
++++ b/tests/blivetgui_tests/add_dialog_test.py
+@@ -10,6 +10,7 @@ import os
+ 
+ from blivet.size import Size
+ from blivet import formats
++from blivet import devicefactory
+ from blivet.devicelibs import raid
+ 
+ 
+@@ -349,6 +350,9 @@ class AddDialogTest(unittest.TestCase):
+         self.assertTrue(add_dialog.size_area.get_sensitive())
+ 
+     def test_btrfsvolume_widgets(self):
++        btrfs_raid_level=devicefactory.get_supported_raid_levels(devicefactory.DEVICE_TYPE_BTRFS)
++        if not len(btrfs_raid_level):
++            self.skipTest("No supported raid level of btrfs found")
+         parent_device = self._get_parent_device()
+         free_device = self._get_free_device(parent=parent_device)
+ 
+@@ -760,6 +764,9 @@ class AddDialogTest(unittest.TestCase):
+         self.assertEqual(selection.raid_level, raidtype)
+ 
+     def test_btrfs_selection(self):
++        btrfs_raid_level=devicefactory.get_supported_raid_levels(devicefactory.DEVICE_TYPE_BTRFS)
++        if not len(btrfs_raid_level):
++            self.skipTest("No supported raid level of btrfs found")
+         parent_device = self._get_parent_device()
+         free_device = self._get_free_device(parent=parent_device, size=Size("8 GiB"), is_free_region=False,
+                                             is_empty_disk=True)
+-- 
+2.27.0
+
-- 
Gitee