packages/blivet-gui
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

enable test

Browse Source 
(cherry picked from commit 5da7d299e5f1f1078bdfc1f226fb14e5d28d6866)
This commit is contained in:
sherlock2010 2023-09-28 07:41:22 +00:00 committed by openeuler-sync-bot
parent 6d99034e72
commit 0cbf724247
2 changed files with 57 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
blivet-gui.spec
View File

@ -1,15 +1,18 @@
Name: blivet-gui
Version: 2.1.15
Release: 2
Release: 3
Summary: Tool for data storage configuration
License: GPLv2+
URL: https://github.com/storaged-project/blivet-gui
Source0: https://github.com/storaged-project/blivet-gui/releases/download/%{version}/%{name}-%{version}.tar.gz
Patch0: 0001-Ignore-fallback-ITS-rule-warning-from-gettext.patch
Patch1: skip-brtfs-raid-test-if-no-support.patch
BuildArch: noarch
BuildRequires: desktop-file-utils libappstream-glib python3-devel gettext python3-setuptools
#required by test
BuildRequires: python3-six python3-gobject-base python3-blivet xorg-x11-server-Xvfb
Requires: python3 python3-gobject gettext python3-blivet gtk3
Requires: PolicyKit-authentication-agent python3-pid libreport adwaita-icon-theme
@ -36,6 +39,9 @@ desktop-file-validate %{buildroot}/%{_datadir}/applications/blivet-gui.desktop
appstream-util validate-relax --nonet %{buildroot}/%{_datadir}/appdata/blivet-gui.appdata.xml
install -d %{buildroot}/%{_localstatedir}/log/blivet-gui
%check
make test
%files
%defattr(-,root,root)
%doc COPYING
@ -56,6 +62,12 @@ install -d %{buildroot}/%{_localstatedir}/log/blivet-gui
%{_mandir}/man1/blivet-gui.1*
%changelog
* Thu Sep 28 2023 zhouyihang<zhouyihang3@h-partners.com> - 2.1.15-3
- Type:requirements
- ID:NA
- SUG:NA
- DESC:enable test
* Fri Sep 4 2020 gaihuiying<gaihuiying1@huawei.com> - 2.1.15-2
- Type:bugfix
- ID:NA

44
skip-brtfs-raid-test-if-no-support.patch Normal file
View File

@ -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
def supported_filesystems():
@@ -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