From fe92db3b3f0b4b1e7bed9abe2ef376ef457e1a4c Mon Sep 17 00:00:00 2001 From: duerpei Date: Wed, 29 Jun 2022 16:05:12 +0800 Subject: qa-test-misc: delete glib2 and rpm Due to the adjustment of the framework, the scripts running the test set are moved to 'agl-test-framework', so they are deleted from 'qa-test-misc' According to the previous discussion, rpm will use its ptest, so rpm also be deleted. Bug-AGL: SPEC-4345 Signed-off-by: duerpei Change-Id: Ib5fb19f410a63d3f68d83714a41dc1beeb053d45 --- rpm/rootfs-scripts/__init__.py | 0 rpm/rootfs-scripts/resource/rpm_test.sh | 4 -- .../resource/test-manual-1.2.3.noarch.rpm | Bin 3293 -> 0 bytes rpm/rootfs-scripts/resource/tests/rpm_01.sh | 13 ----- rpm/rootfs-scripts/resource/tests/rpm_02.sh | 21 ------- rpm/rootfs-scripts/resource/tests/rpm_03.sh | 14 ----- rpm/rootfs-scripts/run_tests.py | 61 --------------------- 7 files changed, 113 deletions(-) delete mode 100644 rpm/rootfs-scripts/__init__.py delete mode 100755 rpm/rootfs-scripts/resource/rpm_test.sh delete mode 100644 rpm/rootfs-scripts/resource/test-manual-1.2.3.noarch.rpm delete mode 100644 rpm/rootfs-scripts/resource/tests/rpm_01.sh delete mode 100644 rpm/rootfs-scripts/resource/tests/rpm_02.sh delete mode 100644 rpm/rootfs-scripts/resource/tests/rpm_03.sh delete mode 100644 rpm/rootfs-scripts/run_tests.py (limited to 'rpm') diff --git a/rpm/rootfs-scripts/__init__.py b/rpm/rootfs-scripts/__init__.py deleted file mode 100644 index e69de29..0000000 diff --git a/rpm/rootfs-scripts/resource/rpm_test.sh b/rpm/rootfs-scripts/resource/rpm_test.sh deleted file mode 100755 index dd5ce37..0000000 --- a/rpm/rootfs-scripts/resource/rpm_test.sh +++ /dev/null @@ -1,4 +0,0 @@ -#!/bin/sh -for i in tests/*.sh; do - sh $i -done diff --git a/rpm/rootfs-scripts/resource/test-manual-1.2.3.noarch.rpm b/rpm/rootfs-scripts/resource/test-manual-1.2.3.noarch.rpm deleted file mode 100644 index d2e681c..0000000 Binary files a/rpm/rootfs-scripts/resource/test-manual-1.2.3.noarch.rpm and /dev/null differ diff --git a/rpm/rootfs-scripts/resource/tests/rpm_01.sh b/rpm/rootfs-scripts/resource/tests/rpm_01.sh deleted file mode 100644 index 6ab9e3d..0000000 --- a/rpm/rootfs-scripts/resource/tests/rpm_01.sh +++ /dev/null @@ -1,13 +0,0 @@ -#!/bin/sh - -# The testscript checks the following options of the command file -# 1) Option help - -test="rpm01" - -if rpm --help | grep .*Usage.* -then - echo " -> $test: TEST-PASS" -else - echo " -> $test: TEST-FAIL" -fi; diff --git a/rpm/rootfs-scripts/resource/tests/rpm_02.sh b/rpm/rootfs-scripts/resource/tests/rpm_02.sh deleted file mode 100644 index 9b0f411..0000000 --- a/rpm/rootfs-scripts/resource/tests/rpm_02.sh +++ /dev/null @@ -1,21 +0,0 @@ -#!/bin/sh - -# The testscript checks the following options of the command file -# 1) Option ql - -test="rpm02" -test_manual="test-manual-1.2.3.noarch" - -if rpm -qa | grep $test_manual -then - rpm -e $test_manual -fi - -rpm -ivh ${test_manual}.rpm --nodeps - -if rpm -ql $test_manual | grep '.*/home/test/rpm-test/text1.txt.*' -then - echo " -> $test: TEST-PASS" -else - echo " -> $test: TEST-FAIL" -fi; diff --git a/rpm/rootfs-scripts/resource/tests/rpm_03.sh b/rpm/rootfs-scripts/resource/tests/rpm_03.sh deleted file mode 100644 index 51d5b95..0000000 --- a/rpm/rootfs-scripts/resource/tests/rpm_03.sh +++ /dev/null @@ -1,14 +0,0 @@ -#!/bin/sh - -# The testscript checks the following options of the command file -# 1) Option qi - -test="rpm03" -test_manual="test-manual-1.2.3.noarch" - -if rpm -qi $test_manual | grep ".*1.2.3.*" -then - echo " -> $test: TEST-PASS" -else - echo " -> $test: TEST-FAIL" -fi; diff --git a/rpm/rootfs-scripts/run_tests.py b/rpm/rootfs-scripts/run_tests.py deleted file mode 100644 index c751faf..0000000 --- a/rpm/rootfs-scripts/run_tests.py +++ /dev/null @@ -1,61 +0,0 @@ -import pytest -import subprocess - -import plugins.agl_test_utils as agl_test_utils - -from plugins.agl_test_base import AGLBaseTest -class RPMBase(AGLBaseTest): - def __init__(self): - super().__init__(name="rpm") - - def run_case(self, case_id): - case_info = self.get_caseinfo_by_name(case_id) - if (case_info[1] == "TEST-PASS"): - case_info[2] = "passed" - else: - case_info[2] == "failed" - self.update_caseinfo_by_name(case_id, case_info) - assert case_info[2] == "passed" - - #Run test, and redirect the log into the file of rpm.log - def run_test_fun(self): - log_file = self.get_logfile() - cwd = self.get_workdir() - with open(log_file,'w') as log_f: - subprocess.run(['sh','rpm_test.sh'],cwd=cwd,stdout=log_f,stderr=log_f) - log_f.close() - -@pytest.fixture(scope='module') -def testbase(): - #init instance for test - instance = RPMBase() - #run test scripts - instance.run_test_fun() - #parser log - instance.log_process() - - yield instance - - #package log files and make report file - instance.log_report() - -def setup_module(testbase: RPMBase): - agl_test_utils.find_cmd("rpm") - -@pytest.mark.oss_default -def test_rpm01(testbase: RPMBase): - name = "rpm01" - testbase.run_case(name) - -@pytest.mark.oss_default -def test_rpm02(testbase: RPMBase): - name = "rpm02" - testbase.run_case(name) - -@pytest.mark.oss_default -def test_rpm03(testbase: RPMBase): - name = "rpm03" - testbase.run_case(name) - -if __name__ == '__main__': - pytest.main("-s run_tests") -- cgit 1.2.3-korg