summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMariano Lopez <mariano.lopez@linux.intel.com>2017-01-19 12:38:06 +0000
committerRichard Purdie <richard.purdie@linuxfoundation.org>2017-01-23 12:05:21 +0000
commit6cea270c544ceb14cbd44f4e5f4e51c3a3dcb143 (patch)
treee2ebab9929dce7ad2f22d8266d31ea4702ce7e4a
parent46ce0b5ef3ee623cc9d366f83030363b470ed11e (diff)
downloadpoky-6cea270c544ceb14cbd44f4e5f4e51c3a3dcb143.tar.gz
poky-6cea270c544ceb14cbd44f4e5f4e51c3a3dcb143.tar.bz2
poky-6cea270c544ceb14cbd44f4e5f4e51c3a3dcb143.zip
selftest/runtime-test.py: Adapt test to use new runtime framework
This adapt the current runtime selftest to use the new runtime framework. (From OE-Core rev: cfeec8a59ba03f98944fd3dca1a67d80e7edb4c9) Signed-off-by: Mariano Lopez <mariano.lopez@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta-selftest/lib/oeqa/runtime/cases/selftest.json (renamed from meta-selftest/lib/oeqa/runtime/selftest.json)0
-rw-r--r--meta-selftest/lib/oeqa/runtime/cases/selftest.py (renamed from meta-selftest/lib/oeqa/runtime/selftest.py)34
-rw-r--r--meta/lib/oeqa/selftest/runtime-test.py42
3 files changed, 31 insertions, 45 deletions
diff --git a/meta-selftest/lib/oeqa/runtime/selftest.json b/meta-selftest/lib/oeqa/runtime/cases/selftest.json
index e5ae46ecd4..e5ae46ecd4 100644
--- a/meta-selftest/lib/oeqa/runtime/selftest.json
+++ b/meta-selftest/lib/oeqa/runtime/cases/selftest.json
diff --git a/meta-selftest/lib/oeqa/runtime/selftest.py b/meta-selftest/lib/oeqa/runtime/cases/selftest.py
index a7e58ab3d5..329470f153 100644
--- a/meta-selftest/lib/oeqa/runtime/selftest.py
+++ b/meta-selftest/lib/oeqa/runtime/cases/selftest.py
@@ -1,13 +1,9 @@
-import os
+from oeqa.runtime.case import OERuntimeTestCase
+from oeqa.core.decorator.depends import OETestDepends
-from oeqa.oetest import oeRuntimeTest, skipModule
-from oeqa.utils.commands import runCmd
-from oeqa.utils.decorators import *
+class Selftest(OERuntimeTestCase):
-class Selftest(oeRuntimeTest):
-
- @skipUnlessPassed("test_ssh")
- @tag("selftest_package_install")
+ @OETestDepends(['ssh.SSHTest.test_ssh'])
def test_install_package(self):
"""
Summary: Check basic package installation functionality.
@@ -21,8 +17,7 @@ class Selftest(oeRuntimeTest):
(status, output) = self.target.run("socat -V")
self.assertEqual(status, 0, msg="socat is not installed")
- @skipUnlessPassed("test_install_package")
- @tag("selftest_package_install")
+ @OETestDepends(['selftest.Selftest.test_install_package'])
def test_verify_unistall(self):
"""
Summary: Check basic package installation functionality.
@@ -34,22 +29,3 @@ class Selftest(oeRuntimeTest):
(status, output) = self.target.run("socat -V")
self.assertNotEqual(status, 0, msg="socat is still installed")
-
- @tag("selftest_sdk")
- def test_sdk(self):
-
- result = runCmd("env -0")
- sdk_path = search_sdk_path(result.output)
- self.assertTrue(sdk_path, msg="Can't find SDK path")
-
- tar_cmd = os.path.join(sdk_path, "tar")
- result = runCmd("%s --help" % tar_cmd)
-
-def search_sdk_path(env):
- for line in env.split("\0"):
- (key, _, value) = line.partition("=")
- if key == "PATH":
- for path in value.split(":"):
- if "pokysdk" in path:
- return path
- return ""
diff --git a/meta/lib/oeqa/selftest/runtime-test.py b/meta/lib/oeqa/selftest/runtime-test.py
index a105f3f579..9e2ecc60f9 100644
--- a/meta/lib/oeqa/selftest/runtime-test.py
+++ b/meta/lib/oeqa/selftest/runtime-test.py
@@ -6,6 +6,10 @@ import re
class TestExport(oeSelfTest):
+ @classmethod
+ def tearDownClass(cls):
+ runCmd("rm -rf /tmp/sdk")
+
def test_testexport_basic(self):
"""
Summary: Check basic testexport functionality with only ping test enabled.
@@ -34,15 +38,15 @@ class TestExport(oeSelfTest):
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)
+ test_path = os.path.join(testexport_dir, "oe-test")
+ data_file = os.path.join(testexport_dir, 'data', 'testdata.json')
+ manifest = os.path.join(testexport_dir, 'data', 'manifest')
+ cmd = ("%s runtime --test-data-file %s --packages-manifest %s "
+ "--target-ip %s --server-ip %s --quiet"
+ % (test_path, data_file, manifest, qemu.ip, qemu.server_ip))
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')
+ self.assertEqual(0, result.status, 'oe-test runtime returned a non 0 status')
def test_testexport_sdk(self):
"""
@@ -61,7 +65,6 @@ class TestExport(oeSelfTest):
features += 'TEST_SERVER_IP = "192.168.7.1"\n'
features += 'TEST_TARGET_IP = "192.168.7.1"\n'
features += 'TEST_SUITES = "ping"\n'
- features += 'TEST_SUITES_TAGS = "selftest_sdk"\n'
features += 'TEST_EXPORT_SDK_ENABLED = "1"\n'
features += 'TEST_EXPORT_SDK_PACKAGES = "nativesdk-tar"\n'
self.write_config(features)
@@ -75,14 +78,22 @@ class TestExport(oeSelfTest):
sdk_dir = get_bb_var('TEST_EXPORT_SDK_DIR', 'core-image-minimal')
tarball_name = "%s.sh" % get_bb_var('TEST_EXPORT_SDK_NAME', 'core-image-minimal')
tarball_path = os.path.join(testexport_dir, sdk_dir, tarball_name)
- self.assertEqual(os.path.isfile(tarball_path), True, "Couldn't find SDK tarball: %s" % tarball_path)
+ msg = "Couldn't find SDK tarball: %s" % tarball_path
+ self.assertEqual(os.path.isfile(tarball_path), True, msg)
+
+ # Extract SDK and run tar from SDK
+ result = runCmd("%s -y -d /tmp/sdk" % tarball_path)
+ self.assertEqual(0, result.status, "Couldn't extract SDK")
+
+ env_script = result.output.split()[-1]
+ result = runCmd(". %s; which tar" % env_script, shell=True)
+ self.assertEqual(0, result.status, "Couldn't setup SDK environment")
+ is_sdk_tar = True if "/tmp/sdk" in result.output else False
+ self.assertTrue(is_sdk_tar, "Couldn't setup SDK environment")
- # Run runexported.py
- runexported_path = os.path.join(testexport_dir, "runexported.py")
- testdata_path = os.path.join(testexport_dir, "testdata.json")
- cmd = "%s %s" % (runexported_path, testdata_path)
- result = runCmd(cmd)
- self.assertEqual(0, result.status, 'runexported.py returned a non 0 status')
+ tar_sdk = result.output
+ result = runCmd("%s --version" % tar_sdk)
+ self.assertEqual(0, result.status, "Couldn't run tar from SDK")
class TestImage(oeSelfTest):
@@ -100,7 +111,6 @@ class TestImage(oeSelfTest):
features = 'INHERIT += "testimage"\n'
features += 'TEST_SUITES = "ping ssh selftest"\n'
- features += 'TEST_SUITES_TAGS = "selftest_package_install"\n'
self.write_config(features)
# Build core-image-sato and testimage