From a577e2a146b6d9e14fefafcb223fdc2680815c14 Mon Sep 17 00:00:00 2001 From: cuixucui <350255958@qq.com> Date: Fri, 24 Jul 2020 11:42:44 +0800 Subject: [PATCH 1/2] delete tape testcase --- README.md | 8 +--- hwcompatible/compatibility.py | 6 --- tests/tape/Makefile | 22 --------- tests/tape/tape.py | 87 ----------------------------------- 4 files changed, 2 insertions(+), 121 deletions(-) delete mode 100755 tests/tape/Makefile delete mode 100755 tests/tape/tape.py diff --git a/README.md b/README.md index ac1bfad..3ee8fb2 100644 --- a/README.md +++ b/README.md @@ -335,15 +335,11 @@ openEuler硬件兼容性验证测试框架有如下特点： 使用 nvme-cli 工具对盘进行格式化、读写、查询测试。 -13. **tape** - - 测试磁带是否正常读写。 - -14. **usb** +13. **usb** 插拔 usb 设备，测试 usb 接口能否正常识别。 -15. **acpi** +14. **acpi** 利用 acpidump 工具读取数据。 diff --git a/hwcompatible/compatibility.py b/hwcompatible/compatibility.py index c97dbf5..79bce2f 100755 --- a/hwcompatible/compatibility.py +++ b/hwcompatible/compatibility.py @@ -266,12 +266,6 @@ class EulerCertification(): if device.get_property("PCI_CLASS") == "30000" or device.get_property("PCI_CLASS") == "38000": sort_devices["video"] = [device] continue - if device.get_property("SUBSYSTEM") == "tape" and "/dev/st" in device.get_property("DEVNAME"): - try: - sort_devices["tape"].extend([device]) - except KeyError: - sort_devices["tape"] = [device] - continue if (device.get_property("DEVTYPE") == "disk" and not device.get_property("ID_TYPE")) or \ device.get_property("ID_TYPE") == "disk": if "nvme" in device.get_property("DEVPATH"): diff --git a/tests/tape/Makefile b/tests/tape/Makefile deleted file mode 100755 index 84bdeb2..0000000 --- a/tests/tape/Makefile +++ /dev/null @@ -1,22 +0,0 @@ -# Copyright (c) 2020 Huawei Technologies Co., Ltd. -# oec-hardware is licensed under the Mulan PSL v2. -# You can use this software according to the terms and conditions of the Mulan PSL v2. -# You may obtain a copy of Mulan PSL v2 at: -# http://license.coscl.org.cn/MulanPSL2 -# THIS SOFTWARE IS PROVIDED ON AN "AS IS" BASIS, WITHOUT WARRANTIES OF ANY KIND, EITHER EXPRESS OR -# IMPLIED, INCLUDING BUT NOT LIMITED TO NON-INFRINGEMENT, MERCHANTABILITY OR FIT FOR A PARTICULAR -# PURPOSE. -# See the Mulan PSL v2 for more details. -# Create: 2020-04-01 - -.PHONY: install clean - -all: ; - -install: - mkdir -p $(DEST) - cp -a *.py $(DEST) - chmod a+x $(DEST)/*.py - -clean: - rm -rf $(DEST) diff --git a/tests/tape/tape.py b/tests/tape/tape.py deleted file mode 100755 index bfb6aa6..0000000 --- a/tests/tape/tape.py +++ /dev/null @@ -1,87 +0,0 @@ -#!/usr/bin/env python -# coding: utf-8 - -# Copyright (c) 2020 Huawei Technologies Co., Ltd. -# oec-hardware is licensed under the Mulan PSL v2. -# You can use this software according to the terms and conditions of the Mulan PSL v2. -# You may obtain a copy of Mulan PSL v2 at: -# http://license.coscl.org.cn/MulanPSL2 -# THIS SOFTWARE IS PROVIDED ON AN "AS IS" BASIS, WITHOUT WARRANTIES OF ANY KIND, EITHER EXPRESS OR -# IMPLIED, INCLUDING BUT NOT LIMITED TO NON-INFRINGEMENT, MERCHANTABILITY OR FIT FOR A PARTICULAR -# PURPOSE. -# See the Mulan PSL v2 for more details. -# Create: 2020-04-01 - -import argparse - -from hwcompatible.test import Test -from hwcompatible.command import Command, CertCommandError - - -class TapeTest(Test): - """ - Tape test - """ - def __init__(self): - Test.__init__(self) - self.args = None - self.device = None - self.tapeDevice = None - - def setup(self, args=None): - """ - Initialization before test - :param args: - :return: - """ - self.args = args or argparse.Namespace() - self.device = getattr(args, "device", None) - self.tapeDevice = self.device.get_property("DEVNAME") - if self.tapeDevice == "": - print("Did not found any Tape Device") - else: - print("Found the Tape Device :\n %s" % self.tapeDevice) - - def test(self): - """ - test case - :return: - """ - if not self.tapeDevice: - return False - - print("Testing tape device %s" % self.tapeDevice) - # set default block size to 32k (64 x 512byte = 32k) - bs = 64 - # rewind the tape - try: - tape_rewind = Command("mt -f %s rewind 2>/dev/null" % self.tapeDevice).read() - print("Rewind tape : \n %s" % tape_rewind) - except CertCommandError as exception: - print(exception) - return False - # Write data - try: - tapewritedata = Command("tar -Pcb %s -f %s /usr" % (bs, self.tapeDevice)).read() - if tapewritedata == 0: - print("Write data done. Start comparing ...") - # Compare data - comparedata = Command("tar -Pdb %s -f %s /usr" % (bs, self.tapeDevice)).read() - if comparedata == 0: - print("Tape test on device %s passed." % self.tapeDevice) - return True - else: - print("Error: data comparison fail.") - return False - else: - print("Error: write data fail.") - return False - - except CertCommandError as exception: - print(exception) - return False - - -if __name__ == "__main__": - main = TapeTest() - main.test() -- Gitee From 6ede27ebca4f9972759ea4778436cd79485f7dfa Mon Sep 17 00:00:00 2001 From: cuixucui <350255958@qq.com> Date: Thu, 13 Aug 2020 10:15:30 +0800 Subject: [PATCH 2/2] add oec-hardware.spec file --- oec-hardware.spec | 85 +++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 85 insertions(+) create mode 100644 oec-hardware.spec diff --git a/oec-hardware.spec b/oec-hardware.spec new file mode 100644 index 0000000..2977533 --- /dev/null +++ b/oec-hardware.spec @@ -0,0 +1,85 @@ +%define version 1.0.0 +%define release 4 +%define debug_package %{nil} +%global _build_id_links none +%undefine __brp_mangle_shebangs + +Name: oec-hardware +Summary: openEuler Hardware Compatibility Test Suite +Version: %{version} +Release: %{release} +Group: Development/Tools +License: Mulan PSL v2 +URL: https://gitee.com/openeuler/oec-hardware +Source0: %{name}-%{version}.tar.bz2 + +#PATCH-FIX-https://gitee.com/src-openEuler/ patch from oec-hardware-1.0.0 project +Patch0001: oec-hardware-1.0.0-system.patch + +#PATCH-FIX-https://gitee.com/src-openEuler/ patch from oec-hardware-1.0.0 project +Patch0002: oec-hardware-1.0.0-delete-tape.patch + +Buildroot: %{_tmppath}/%{name}-%{version}-root +BuildRequires: gcc +Requires: kernel-devel, kernel-headers, dmidecode, tar +Requires: qperf, fio, memtester +Requires: kernel >= 4 +Requires: python3 + +# server subpackage +%package server +Summary: openEuler Hardware Compatibility Test Server +Group: Development/Tools +Requires: python3, python3-devel, nginx, tar, qperf, psmisc + +%description +openEuler Hardware Compatibility Test Suite + +%description server +openEuler Hardware Compatibility Test Server + +%prep +%setup -q -c + +%build +[ "$RPM_BUILD_ROOT" != "/" ] && [ -d $RPM_BUILD_ROOT ] && rm -rf $RPM_BUILD_ROOT; +DESTDIR=$RPM_BUILD_ROOT VERSION_RELEASE=%{version} make + +%install +DESTDIR=$RPM_BUILD_ROOT make install + +%clean +[ "$RPM_BUILD_ROOT" != "/" ] && [ -d $RPM_BUILD_ROOT ] && rm -rf $RPM_BUILD_ROOT; + +%pre + +%post + +%files +%defattr(-,root,root) +/usr/bin/oech +/usr/share/oech/kernelrelease.json +/usr/share/oech/lib/hwcompatible +/usr/share/oech/lib/tests +/usr/lib/systemd/system/oech.service +%dir /var/oech +%dir /usr/share/oech/lib +%dir /usr/share/oech + +%files server +%defattr(-,root,root) +/usr/share/oech/lib/server +/usr/share/oech/lib/server/uwsgi.ini +/usr/share/oech/lib/server/uwsgi.conf +/usr/lib/systemd/system/oech-server.service + +%postun +rm -rf /var/lock/oech.lock + +%changelog +* Fri Jul 24 2020 Cui XuCui - 1.0.0-4 +* Sun Jul 18 2020 Cui XuCui - 1.0.0-3 +* Sun Jul 01 2020 Cui XuCui - 1.0.0-2 +* Fri Jul 26 2019 Lu Tianxiong - 1.0.0-h1 +- Initial spec + -- Gitee