From cffab2257dacfa741c64611dfdf361f77aff9460 Mon Sep 17 00:00:00 2001 From: Mariano Lopez Date: Mon, 13 Jun 2016 12:49:55 +0000 Subject: selftest/runtime-test.py: Add test for import test from other layers There are some features in testimage/testexport that are not tested; this might lead to break some of these features without notice. This adds a new test in order to test two features of testimage: - Import test from other layers. - Install/Unistall in the DUT without a package manager. [YOCTO #9764] [YOCTO #9766] Signed-off-by: Mariano Lopez Signed-off-by: Ross Burton --- meta-selftest/lib/oeqa/runtime/selftest.json | 6 +++ meta-selftest/lib/oeqa/runtime/selftest.py | 31 ++++++++++++++ meta/lib/oeqa/selftest/runtime-test.py | 64 ++++++++++++++++++++++++++++ meta/lib/oeqa/selftest/testexport.py | 44 ------------------- 4 files changed, 101 insertions(+), 44 deletions(-) create mode 100644 meta-selftest/lib/oeqa/runtime/selftest.json create mode 100644 meta-selftest/lib/oeqa/runtime/selftest.py create mode 100644 meta/lib/oeqa/selftest/runtime-test.py delete mode 100644 meta/lib/oeqa/selftest/testexport.py diff --git a/meta-selftest/lib/oeqa/runtime/selftest.json b/meta-selftest/lib/oeqa/runtime/selftest.json new file mode 100644 index 0000000000..e5ae46ecd4 --- /dev/null +++ b/meta-selftest/lib/oeqa/runtime/selftest.json @@ -0,0 +1,6 @@ +{ + "test_install_package": { + "pkg": "socat", + "rm": true + } +} diff --git a/meta-selftest/lib/oeqa/runtime/selftest.py b/meta-selftest/lib/oeqa/runtime/selftest.py new file mode 100644 index 0000000000..b9c9b23bfc --- /dev/null +++ b/meta-selftest/lib/oeqa/runtime/selftest.py @@ -0,0 +1,31 @@ +from oeqa.oetest import oeRuntimeTest, skipModule +from oeqa.utils.decorators import * + +class Selftest(oeRuntimeTest): + + @skipUnlessPassed("test_ssh") + def test_install_package(self): + """ + Summary: Check basic package installation functionality. + Expected: 1. Before the test socat must be installed using scp. + 2. After the test socat must be unistalled using ssh. + This can't be checked in this test. + Product: oe-core + Author: Mariano Lopez + """ + + (status, output) = self.target.run("socat -V") + self.assertEqual(status, 0, msg="socat is not installed") + + @skipUnlessPassed("test_install_package") + def test_verify_unistall(self): + """ + Summary: Check basic package installation functionality. + Expected: 1. test_install_package must unistall socat. + This test is just to verify that. + Product: oe-core + Author: Mariano Lopez + """ + + (status, output) = self.target.run("socat -V") + self.assertNotEqual(status, 0, msg="socat is still installed") diff --git a/meta/lib/oeqa/selftest/runtime-test.py b/meta/lib/oeqa/selftest/runtime-test.py new file mode 100644 index 0000000000..b8e1be10f8 --- /dev/null +++ b/meta/lib/oeqa/selftest/runtime-test.py @@ -0,0 +1,64 @@ +from oeqa.selftest.base import oeSelfTest +from oeqa.utils.commands import runCmd, bitbake, get_bb_var, runqemu +from oeqa.utils.decorators import testcase +import os + +class TestExport(oeSelfTest): + + def test_testexport_basic(self): + """ + Summary: Check basic testexport functionality with only ping test enabled. + Expected: 1. testexport directory must be created. + 2. runexported.py must run without any error/exception. + 3. ping test must succeed. + Product: oe-core + Author: Mariano Lopez + """ + + features = 'INHERIT += "testexport"\n' + # These aren't the actual IP addresses but testexport class needs something defined + features += 'TEST_SERVER_IP = "192.168.7.1"\n' + features += 'TEST_TARGET_IP = "192.168.7.1"\n' + features += 'TEST_SUITES = "ping"\n' + self.write_config(features) + + # Build tesexport for core-image-minimal + bitbake('core-image-minimal') + bitbake('-c testexport core-image-minimal') + + # Verify if TEST_EXPORT_DIR was created + testexport_dir = get_bb_var('TEST_EXPORT_DIR', 'core-image-minimal') + isdir = os.path.isdir(testexport_dir) + self.assertEqual(True, isdir, 'Failed to create testexport dir: %s' % testexport_dir) + + with runqemu('core-image-minimal') as qemu: + # Attempt to run runexported.py to perform ping test + runexported_path = os.path.join(testexport_dir, "runexported.py") + testdata_path = os.path.join(testexport_dir, "testdata.json") + cmd = "%s -t %s -s %s %s" % (runexported_path, qemu.ip, qemu.server_ip, testdata_path) + result = runCmd(cmd) + self.assertEqual(0, result.status, 'runexported.py returned a non 0 status') + + # Verify ping test was succesful + failure = True if 'FAIL' in result.output else False + self.assertNotEqual(True, failure, 'ping test failed') + + +class TestImage(oeSelfTest): + + def test_testimage_install(self): + """ + Summary: Check install packages functionality for testimage/testexport. + Expected: 1. Import tests from a directory other than meta. + 2. Check install/unistall of socat. + Product: oe-core + Author: Mariano Lopez + """ + + features = 'INHERIT += "testimage"\n' + features += 'TEST_SUITES = "ping ssh selftest"\n' + self.write_config(features) + + # Build core-image-sato and testimage + bitbake('core-image-full-cmdline socat') + bitbake('-c testimage core-image-full-cmdline') diff --git a/meta/lib/oeqa/selftest/testexport.py b/meta/lib/oeqa/selftest/testexport.py deleted file mode 100644 index 5823b1303c..0000000000 --- a/meta/lib/oeqa/selftest/testexport.py +++ /dev/null @@ -1,44 +0,0 @@ -from oeqa.selftest.base import oeSelfTest -from oeqa.utils.commands import runCmd, bitbake, get_bb_var, runqemu -from oeqa.utils.decorators import testcase -import os - -class TestExport(oeSelfTest): - - def test_testexport_basic(self): - """ - Summary: Check basic testexport functionality with only ping test enabled. - Expected: 1. testexport directory must be created. - 2. runexported.py must run without any error/exception. - 3. ping test must succeed. - Product: oe-core - Author: Mariano Lopez - """ - - features = 'INHERIT += "testexport"\n' - # These aren't the actual IP addresses but testexport class needs something defined - features += 'TEST_SERVER_IP = "192.168.7.1"\n' - features += 'TEST_TARGET_IP = "192.168.7.1"\n' - features += 'TEST_SUITES = "ping"\n' - self.write_config(features) - - # Build tesexport for core-image-minimal - bitbake('core-image-minimal') - bitbake('-c testexport core-image-minimal') - - # Verify if TEST_EXPORT_DIR was created - testexport_dir = get_bb_var('TEST_EXPORT_DIR', 'core-image-minimal') - isdir = os.path.isdir(testexport_dir) - self.assertEqual(True, isdir, 'Failed to create testexport dir: %s' % testexport_dir) - - with runqemu('core-image-minimal') as qemu: - # Attempt to run runexported.py to perform ping test - runexported_path = os.path.join(testexport_dir, "runexported.py") - testdata_path = os.path.join(testexport_dir, "testdata.json") - cmd = "%s -t %s -s %s %s" % (runexported_path, qemu.ip, qemu.server_ip, testdata_path) - result = runCmd(cmd) - self.assertEqual(0, result.status, 'runexported.py returned a non 0 status') - - # Verify ping test was succesful - failure = True if 'FAIL' in result.output else False - self.assertNotEqual(True, failure, 'ping test failed') -- cgit 1.2.3-korg