From 6848a2133168ee0f2bee8fe2fcc5c7f4ad92b842 Mon Sep 17 00:00:00 2001 From: cuixucui <350255958@qq.com> Date: Mon, 5 Sep 2022 20:03:38 +0800 Subject: [PATCH] fix system test case failed --- oec-hardware-1.1.2-fix-system.patch | 12 ++++++++++++ oec-hardware.spec | 7 ++++++- 2 files changed, 18 insertions(+), 1 deletion(-) create mode 100644 oec-hardware-1.1.2-fix-system.patch diff --git a/oec-hardware-1.1.2-fix-system.patch b/oec-hardware-1.1.2-fix-system.patch new file mode 100644 index 0000000..f1324ae --- /dev/null +++ b/oec-hardware-1.1.2-fix-system.patch @@ -0,0 +1,12 @@ +diff -Naur rpm/tests/system/system.py oech/tests/system/system.py +--- rpm/tests/system/system.py 2022-09-05 16:28:46.418278940 +0800 ++++ oech/tests/system/system.py 2022-09-05 16:31:23.830278940 +0800 +@@ -62,7 +62,7 @@ + + output = rpm_verify[0].split('\n') + for file in output: +- if "test_config.yaml" in file: ++ if not file or "test_config.yaml" in file: + continue + flag = False + self.logger.error( diff --git a/oec-hardware.spec b/oec-hardware.spec index 6d6b8fe..439f96a 100644 --- a/oec-hardware.spec +++ b/oec-hardware.spec @@ -4,7 +4,7 @@ Name: oec-hardware Summary: openEuler Hardware Compatibility Test Suite Version: 1.1.2 -Release: 1 +Release: 2 Group: Development/Tools License: Mulan PSL v2 URL: https://gitee.com/openeuler/oec-hardware @@ -12,6 +12,7 @@ Source0: https://gitee.com/openeuler/oec-hardware/repository/archive/v%{v # patch fix issue Patch0001: oec-hardware-1.1.2-fix-oech.service_status_failed.patch +Patch0002: oec-hardware-1.1.2-fix-system.patch Buildroot: %{_tmppath}/%{name}-%{version}-root BuildRequires: gcc @@ -35,6 +36,7 @@ openEuler Hardware Compatibility Test Server %prep %setup -q -c %patch1 -p1 +%patch2 -p1 %build @@ -77,6 +79,9 @@ DESTDIR=$RPM_BUILD_ROOT make install rm -rf /var/lock/oech.lock %changelog +* Mon Sep 05 2022 cuixucui - 1.1.2-2 +- Fix Check whether the tool is modified failed + * Sat Sep 03 2022 ylzhangah - 1.1.2-1 - Fix the status failed in checking oech.service status after stoped oech.service -- Gitee