diff options
author | Lucian Musat <georgex.l.musat@intel.com> | 2014-07-25 12:02:30 +0300 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2014-07-25 16:54:42 +0100 |
commit | 8e26ab7d52edd13ffa50b2d0b26606bea8890e76 (patch) | |
tree | 2b2bcfc87341d3a5136710c8412fb6348ce2069d /meta/lib/oeqa | |
parent | 242cceeedf2351e4337d8e45fb4c2c8360937ead (diff) | |
download | poky-8e26ab7d52edd13ffa50b2d0b26606bea8890e76.tar.gz |
oeqa/rutime: Added testcase decorators for automated runtime tests. Also added LogResults decorator for oeTest class in oetest.py
(From OE-Core rev: 95b83084487d0712362ade8ac487999c3274bb96)
Signed-off-by: Lucian Musat <georgex.l.musat@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/lib/oeqa')
27 files changed, 48 insertions, 2 deletions
diff --git a/meta/lib/oeqa/oetest.py b/meta/lib/oeqa/oetest.py index ecb8e53705..dcbd498fca 100644 --- a/meta/lib/oeqa/oetest.py +++ b/meta/lib/oeqa/oetest.py | |||
@@ -10,6 +10,7 @@ | |||
10 | import os, re, mmap | 10 | import os, re, mmap |
11 | import unittest | 11 | import unittest |
12 | import inspect | 12 | import inspect |
13 | from oeqa.utils.decorators import LogResults | ||
13 | 14 | ||
14 | def loadTests(tc): | 15 | def loadTests(tc): |
15 | 16 | ||
@@ -35,6 +36,7 @@ def runTests(tc): | |||
35 | 36 | ||
36 | return result | 37 | return result |
37 | 38 | ||
39 | @LogResults | ||
38 | class oeTest(unittest.TestCase): | 40 | class oeTest(unittest.TestCase): |
39 | 41 | ||
40 | longMessage = True | 42 | longMessage = True |
diff --git a/meta/lib/oeqa/runtime/buildcvs.py b/meta/lib/oeqa/runtime/buildcvs.py index 6201ed1a43..fe6cbfbcd5 100644 --- a/meta/lib/oeqa/runtime/buildcvs.py +++ b/meta/lib/oeqa/runtime/buildcvs.py | |||
@@ -14,6 +14,7 @@ class BuildCvsTest(oeRuntimeTest): | |||
14 | "http://ftp.gnu.org/non-gnu/cvs/source/feature/1.12.13/cvs-1.12.13.tar.bz2") | 14 | "http://ftp.gnu.org/non-gnu/cvs/source/feature/1.12.13/cvs-1.12.13.tar.bz2") |
15 | self.project.download_archive() | 15 | self.project.download_archive() |
16 | 16 | ||
17 | @testcase(205) | ||
17 | @skipUnlessPassed("test_ssh") | 18 | @skipUnlessPassed("test_ssh") |
18 | def test_cvs(self): | 19 | def test_cvs(self): |
19 | self.assertEqual(self.project.run_configure(), 0, | 20 | self.assertEqual(self.project.run_configure(), 0, |
diff --git a/meta/lib/oeqa/runtime/buildiptables.py b/meta/lib/oeqa/runtime/buildiptables.py index c77b11452c..09e252df8c 100644 --- a/meta/lib/oeqa/runtime/buildiptables.py +++ b/meta/lib/oeqa/runtime/buildiptables.py | |||
@@ -14,6 +14,7 @@ class BuildIptablesTest(oeRuntimeTest): | |||
14 | "http://netfilter.org/projects/iptables/files/iptables-1.4.13.tar.bz2") | 14 | "http://netfilter.org/projects/iptables/files/iptables-1.4.13.tar.bz2") |
15 | self.project.download_archive() | 15 | self.project.download_archive() |
16 | 16 | ||
17 | @testcase(206) | ||
17 | @skipUnlessPassed("test_ssh") | 18 | @skipUnlessPassed("test_ssh") |
18 | def test_iptables(self): | 19 | def test_iptables(self): |
19 | self.assertEqual(self.project.run_configure(), 0, | 20 | self.assertEqual(self.project.run_configure(), 0, |
diff --git a/meta/lib/oeqa/runtime/buildsudoku.py b/meta/lib/oeqa/runtime/buildsudoku.py index f51af92ec6..802b060010 100644 --- a/meta/lib/oeqa/runtime/buildsudoku.py +++ b/meta/lib/oeqa/runtime/buildsudoku.py | |||
@@ -14,6 +14,7 @@ class SudokuTest(oeRuntimeTest): | |||
14 | "http://downloads.sourceforge.net/project/sudoku-savant/sudoku-savant/sudoku-savant-1.3/sudoku-savant-1.3.tar.bz2") | 14 | "http://downloads.sourceforge.net/project/sudoku-savant/sudoku-savant/sudoku-savant-1.3/sudoku-savant-1.3.tar.bz2") |
15 | self.project.download_archive() | 15 | self.project.download_archive() |
16 | 16 | ||
17 | @testcase(207) | ||
17 | @skipUnlessPassed("test_ssh") | 18 | @skipUnlessPassed("test_ssh") |
18 | def test_sudoku(self): | 19 | def test_sudoku(self): |
19 | self.assertEqual(self.project.run_configure(), 0, | 20 | self.assertEqual(self.project.run_configure(), 0, |
diff --git a/meta/lib/oeqa/runtime/connman.py b/meta/lib/oeqa/runtime/connman.py index c03688206f..cc537f7766 100644 --- a/meta/lib/oeqa/runtime/connman.py +++ b/meta/lib/oeqa/runtime/connman.py | |||
@@ -21,7 +21,7 @@ class ConnmanTest(oeRuntimeTest): | |||
21 | (status, output) = self.target.run('/usr/sbin/connmand --help') | 21 | (status, output) = self.target.run('/usr/sbin/connmand --help') |
22 | self.assertEqual(status, 0, msg="status and output: %s and %s" % (status,output)) | 22 | self.assertEqual(status, 0, msg="status and output: %s and %s" % (status,output)) |
23 | 23 | ||
24 | 24 | @testcase(221) | |
25 | @skipUnlessPassed('test_connmand_help') | 25 | @skipUnlessPassed('test_connmand_help') |
26 | def test_connmand_running(self): | 26 | def test_connmand_running(self): |
27 | (status, output) = self.target.run(oeRuntimeTest.pscmd + ' | grep [c]onnmand') | 27 | (status, output) = self.target.run(oeRuntimeTest.pscmd + ' | grep [c]onnmand') |
diff --git a/meta/lib/oeqa/runtime/date.py b/meta/lib/oeqa/runtime/date.py index a208e29ada..97e8ee42ad 100644 --- a/meta/lib/oeqa/runtime/date.py +++ b/meta/lib/oeqa/runtime/date.py | |||
@@ -4,6 +4,7 @@ import re | |||
4 | 4 | ||
5 | class DateTest(oeRuntimeTest): | 5 | class DateTest(oeRuntimeTest): |
6 | 6 | ||
7 | @testcase(211) | ||
7 | @skipUnlessPassed("test_ssh") | 8 | @skipUnlessPassed("test_ssh") |
8 | def test_date(self): | 9 | def test_date(self): |
9 | (status, output) = self.target.run('date +"%Y-%m-%d %T"') | 10 | (status, output) = self.target.run('date +"%Y-%m-%d %T"') |
diff --git a/meta/lib/oeqa/runtime/df.py b/meta/lib/oeqa/runtime/df.py index b6da35027c..09569d5ff6 100644 --- a/meta/lib/oeqa/runtime/df.py +++ b/meta/lib/oeqa/runtime/df.py | |||
@@ -5,6 +5,7 @@ from oeqa.utils.decorators import * | |||
5 | 5 | ||
6 | class DfTest(oeRuntimeTest): | 6 | class DfTest(oeRuntimeTest): |
7 | 7 | ||
8 | @testcase(234) | ||
8 | @skipUnlessPassed("test_ssh") | 9 | @skipUnlessPassed("test_ssh") |
9 | def test_df(self): | 10 | def test_df(self): |
10 | (status,output) = self.target.run("df / | sed -n '2p' | awk '{print $4}'") | 11 | (status,output) = self.target.run("df / | sed -n '2p' | awk '{print $4}'") |
diff --git a/meta/lib/oeqa/runtime/dmesg.py b/meta/lib/oeqa/runtime/dmesg.py index 64247ea704..43e16c3f79 100644 --- a/meta/lib/oeqa/runtime/dmesg.py +++ b/meta/lib/oeqa/runtime/dmesg.py | |||
@@ -5,6 +5,7 @@ from oeqa.utils.decorators import * | |||
5 | 5 | ||
6 | class DmesgTest(oeRuntimeTest): | 6 | class DmesgTest(oeRuntimeTest): |
7 | 7 | ||
8 | @testcase(215) | ||
8 | @skipUnlessPassed('test_ssh') | 9 | @skipUnlessPassed('test_ssh') |
9 | def test_dmesg(self): | 10 | def test_dmesg(self): |
10 | (status, output) = self.target.run('dmesg | grep -v mmci-pl18x | grep -v "error changing net interface name" | grep -iv "dma timeout" | grep -i error') | 11 | (status, output) = self.target.run('dmesg | grep -v mmci-pl18x | grep -v "error changing net interface name" | grep -iv "dma timeout" | grep -i error') |
diff --git a/meta/lib/oeqa/runtime/gcc.py b/meta/lib/oeqa/runtime/gcc.py index b63badd3e4..08b3cf1230 100644 --- a/meta/lib/oeqa/runtime/gcc.py +++ b/meta/lib/oeqa/runtime/gcc.py | |||
@@ -15,18 +15,21 @@ class GccCompileTest(oeRuntimeTest): | |||
15 | oeRuntimeTest.tc.target.copy_to(os.path.join(oeRuntimeTest.tc.filesdir, "test.c"), "/tmp/test.c") | 15 | oeRuntimeTest.tc.target.copy_to(os.path.join(oeRuntimeTest.tc.filesdir, "test.c"), "/tmp/test.c") |
16 | oeRuntimeTest.tc.target.copy_to(os.path.join(oeRuntimeTest.tc.filesdir, "testmakefile"), "/tmp/testmakefile") | 16 | oeRuntimeTest.tc.target.copy_to(os.path.join(oeRuntimeTest.tc.filesdir, "testmakefile"), "/tmp/testmakefile") |
17 | 17 | ||
18 | @testcase(203) | ||
18 | def test_gcc_compile(self): | 19 | def test_gcc_compile(self): |
19 | (status, output) = self.target.run('gcc /tmp/test.c -o /tmp/test -lm') | 20 | (status, output) = self.target.run('gcc /tmp/test.c -o /tmp/test -lm') |
20 | self.assertEqual(status, 0, msg="gcc compile failed, output: %s" % output) | 21 | self.assertEqual(status, 0, msg="gcc compile failed, output: %s" % output) |
21 | (status, output) = self.target.run('/tmp/test') | 22 | (status, output) = self.target.run('/tmp/test') |
22 | self.assertEqual(status, 0, msg="running compiled file failed, output %s" % output) | 23 | self.assertEqual(status, 0, msg="running compiled file failed, output %s" % output) |
23 | 24 | ||
25 | @testcase(200) | ||
24 | def test_gpp_compile(self): | 26 | def test_gpp_compile(self): |
25 | (status, output) = self.target.run('g++ /tmp/test.c -o /tmp/test -lm') | 27 | (status, output) = self.target.run('g++ /tmp/test.c -o /tmp/test -lm') |
26 | self.assertEqual(status, 0, msg="g++ compile failed, output: %s" % output) | 28 | self.assertEqual(status, 0, msg="g++ compile failed, output: %s" % output) |
27 | (status, output) = self.target.run('/tmp/test') | 29 | (status, output) = self.target.run('/tmp/test') |
28 | self.assertEqual(status, 0, msg="running compiled file failed, output %s" % output) | 30 | self.assertEqual(status, 0, msg="running compiled file failed, output %s" % output) |
29 | 31 | ||
32 | @testcase(204) | ||
30 | def test_make(self): | 33 | def test_make(self): |
31 | (status, output) = self.target.run('cd /tmp; make -f testmakefile') | 34 | (status, output) = self.target.run('cd /tmp; make -f testmakefile') |
32 | self.assertEqual(status, 0, msg="running make failed, output %s" % output) | 35 | self.assertEqual(status, 0, msg="running make failed, output %s" % output) |
diff --git a/meta/lib/oeqa/runtime/kernelmodule.py b/meta/lib/oeqa/runtime/kernelmodule.py index cbc5742eff..2e81720327 100644 --- a/meta/lib/oeqa/runtime/kernelmodule.py +++ b/meta/lib/oeqa/runtime/kernelmodule.py | |||
@@ -14,6 +14,7 @@ class KernelModuleTest(oeRuntimeTest): | |||
14 | self.target.copy_to(os.path.join(oeRuntimeTest.tc.filesdir, "hellomod.c"), "/tmp/hellomod.c") | 14 | self.target.copy_to(os.path.join(oeRuntimeTest.tc.filesdir, "hellomod.c"), "/tmp/hellomod.c") |
15 | self.target.copy_to(os.path.join(oeRuntimeTest.tc.filesdir, "hellomod_makefile"), "/tmp/Makefile") | 15 | self.target.copy_to(os.path.join(oeRuntimeTest.tc.filesdir, "hellomod_makefile"), "/tmp/Makefile") |
16 | 16 | ||
17 | @testcase('316') | ||
17 | @skipUnlessPassed('test_ssh') | 18 | @skipUnlessPassed('test_ssh') |
18 | @skipUnlessPassed('test_gcc_compile') | 19 | @skipUnlessPassed('test_gcc_compile') |
19 | def test_kernel_module(self): | 20 | def test_kernel_module(self): |
diff --git a/meta/lib/oeqa/runtime/ldd.py b/meta/lib/oeqa/runtime/ldd.py index 079130f833..bce56c4270 100644 --- a/meta/lib/oeqa/runtime/ldd.py +++ b/meta/lib/oeqa/runtime/ldd.py | |||
@@ -13,6 +13,7 @@ class LddTest(oeRuntimeTest): | |||
13 | (status, output) = self.target.run('which ldd') | 13 | (status, output) = self.target.run('which ldd') |
14 | self.assertEqual(status, 0, msg = "ldd does not exist in PATH: which ldd: %s" % output) | 14 | self.assertEqual(status, 0, msg = "ldd does not exist in PATH: which ldd: %s" % output) |
15 | 15 | ||
16 | @testcase(239) | ||
16 | @skipUnlessPassed('test_ldd_exists') | 17 | @skipUnlessPassed('test_ldd_exists') |
17 | def test_ldd_rtldlist_check(self): | 18 | def test_ldd_rtldlist_check(self): |
18 | (status, output) = self.target.run('for i in $(which ldd | xargs cat | grep "^RTLDLIST"|cut -d\'=\' -f2|tr -d \'"\'); do test -f $i && echo $i && break; done') | 19 | (status, output) = self.target.run('for i in $(which ldd | xargs cat | grep "^RTLDLIST"|cut -d\'=\' -f2|tr -d \'"\'); do test -f $i && echo $i && break; done') |
diff --git a/meta/lib/oeqa/runtime/logrotate.py b/meta/lib/oeqa/runtime/logrotate.py index 80489a3267..86d791c300 100644 --- a/meta/lib/oeqa/runtime/logrotate.py +++ b/meta/lib/oeqa/runtime/logrotate.py | |||
@@ -19,6 +19,7 @@ class LogrotateTest(oeRuntimeTest): | |||
19 | (status, output) = self.target.run("sed -i 's#wtmp {#wtmp {\\n olddir /home/root/logrotate_dir#' /etc/logrotate.conf") | 19 | (status, output) = self.target.run("sed -i 's#wtmp {#wtmp {\\n olddir /home/root/logrotate_dir#' /etc/logrotate.conf") |
20 | self.assertEqual(status, 0, msg = "Could not write to logrotate.conf file. Status and output: %s and %s)" % (status, output)) | 20 | self.assertEqual(status, 0, msg = "Could not write to logrotate.conf file. Status and output: %s and %s)" % (status, output)) |
21 | 21 | ||
22 | @testcase(289) | ||
22 | @skipUnlessPassed("test_1_logrotate_setup") | 23 | @skipUnlessPassed("test_1_logrotate_setup") |
23 | def test_2_logrotate(self): | 24 | def test_2_logrotate(self): |
24 | (status, output) = self.target.run('logrotate -f /etc/logrotate.conf') | 25 | (status, output) = self.target.run('logrotate -f /etc/logrotate.conf') |
diff --git a/meta/lib/oeqa/runtime/multilib.py b/meta/lib/oeqa/runtime/multilib.py index 13a3b54b18..ab0a6ccd69 100644 --- a/meta/lib/oeqa/runtime/multilib.py +++ b/meta/lib/oeqa/runtime/multilib.py | |||
@@ -10,6 +10,7 @@ def setUpModule(): | |||
10 | 10 | ||
11 | class MultilibTest(oeRuntimeTest): | 11 | class MultilibTest(oeRuntimeTest): |
12 | 12 | ||
13 | @testcase('279') | ||
13 | @skipUnlessPassed('test_ssh') | 14 | @skipUnlessPassed('test_ssh') |
14 | def test_file_connman(self): | 15 | def test_file_connman(self): |
15 | self.assertTrue(oeRuntimeTest.hasPackage('connman-gnome'), msg="This test assumes connman-gnome is installed") | 16 | self.assertTrue(oeRuntimeTest.hasPackage('connman-gnome'), msg="This test assumes connman-gnome is installed") |
diff --git a/meta/lib/oeqa/runtime/pam.py b/meta/lib/oeqa/runtime/pam.py index c26e6ea849..ae50f79061 100644 --- a/meta/lib/oeqa/runtime/pam.py +++ b/meta/lib/oeqa/runtime/pam.py | |||
@@ -12,6 +12,7 @@ def setUpModule(): | |||
12 | 12 | ||
13 | class PamBasicTest(oeRuntimeTest): | 13 | class PamBasicTest(oeRuntimeTest): |
14 | 14 | ||
15 | @testcase(287) | ||
15 | @skipUnlessPassed('test_ssh') | 16 | @skipUnlessPassed('test_ssh') |
16 | def test_pam(self): | 17 | def test_pam(self): |
17 | (status, output) = self.target.run('login --help') | 18 | (status, output) = self.target.run('login --help') |
diff --git a/meta/lib/oeqa/runtime/perl.py b/meta/lib/oeqa/runtime/perl.py index c9bb684c11..65da028d4b 100644 --- a/meta/lib/oeqa/runtime/perl.py +++ b/meta/lib/oeqa/runtime/perl.py | |||
@@ -18,6 +18,7 @@ class PerlTest(oeRuntimeTest): | |||
18 | (status, output) = self.target.run('which perl') | 18 | (status, output) = self.target.run('which perl') |
19 | self.assertEqual(status, 0, msg="Perl binary not in PATH or not on target.") | 19 | self.assertEqual(status, 0, msg="Perl binary not in PATH or not on target.") |
20 | 20 | ||
21 | @testcase(208) | ||
21 | def test_perl_works(self): | 22 | def test_perl_works(self): |
22 | (status, output) = self.target.run('perl /tmp/test.pl') | 23 | (status, output) = self.target.run('perl /tmp/test.pl') |
23 | self.assertEqual(status, 0, msg="Exit status was not 0. Output: %s" % output) | 24 | self.assertEqual(status, 0, msg="Exit status was not 0. Output: %s" % output) |
diff --git a/meta/lib/oeqa/runtime/python.py b/meta/lib/oeqa/runtime/python.py index c037ab2c18..0387b9a03e 100644 --- a/meta/lib/oeqa/runtime/python.py +++ b/meta/lib/oeqa/runtime/python.py | |||
@@ -18,6 +18,7 @@ class PythonTest(oeRuntimeTest): | |||
18 | (status, output) = self.target.run('which python') | 18 | (status, output) = self.target.run('which python') |
19 | self.assertEqual(status, 0, msg="Python binary not in PATH or not on target.") | 19 | self.assertEqual(status, 0, msg="Python binary not in PATH or not on target.") |
20 | 20 | ||
21 | @testcase(965) | ||
21 | def test_python_stdout(self): | 22 | def test_python_stdout(self): |
22 | (status, output) = self.target.run('python /tmp/test.py') | 23 | (status, output) = self.target.run('python /tmp/test.py') |
23 | self.assertEqual(status, 0, msg="Exit status was not 0. Output: %s" % output) | 24 | self.assertEqual(status, 0, msg="Exit status was not 0. Output: %s" % output) |
diff --git a/meta/lib/oeqa/runtime/rpm.py b/meta/lib/oeqa/runtime/rpm.py index 084d22f96b..b17e8b46a8 100644 --- a/meta/lib/oeqa/runtime/rpm.py +++ b/meta/lib/oeqa/runtime/rpm.py | |||
@@ -18,6 +18,7 @@ class RpmBasicTest(oeRuntimeTest): | |||
18 | (status, output) = self.target.run('rpm --help') | 18 | (status, output) = self.target.run('rpm --help') |
19 | self.assertEqual(status, 0, msg="status and output: %s and %s" % (status,output)) | 19 | self.assertEqual(status, 0, msg="status and output: %s and %s" % (status,output)) |
20 | 20 | ||
21 | @testcase(191) | ||
21 | @skipUnlessPassed('test_rpm_help') | 22 | @skipUnlessPassed('test_rpm_help') |
22 | def test_rpm_query(self): | 23 | def test_rpm_query(self): |
23 | (status, output) = self.target.run('rpm -q rpm') | 24 | (status, output) = self.target.run('rpm -q rpm') |
@@ -34,11 +35,13 @@ class RpmInstallRemoveTest(oeRuntimeTest): | |||
34 | testrpmfile = f | 35 | testrpmfile = f |
35 | oeRuntimeTest.tc.target.copy_to(os.path.join(rpmdir,testrpmfile), "/tmp/rpm-doc.rpm") | 36 | oeRuntimeTest.tc.target.copy_to(os.path.join(rpmdir,testrpmfile), "/tmp/rpm-doc.rpm") |
36 | 37 | ||
38 | @testcase(192) | ||
37 | @skipUnlessPassed('test_rpm_help') | 39 | @skipUnlessPassed('test_rpm_help') |
38 | def test_rpm_install(self): | 40 | def test_rpm_install(self): |
39 | (status, output) = self.target.run('rpm -ivh /tmp/rpm-doc.rpm') | 41 | (status, output) = self.target.run('rpm -ivh /tmp/rpm-doc.rpm') |
40 | self.assertEqual(status, 0, msg="Failed to install rpm-doc package: %s" % output) | 42 | self.assertEqual(status, 0, msg="Failed to install rpm-doc package: %s" % output) |
41 | 43 | ||
44 | @testcase(194) | ||
42 | @skipUnlessPassed('test_rpm_install') | 45 | @skipUnlessPassed('test_rpm_install') |
43 | def test_rpm_remove(self): | 46 | def test_rpm_remove(self): |
44 | (status,output) = self.target.run('rpm -e rpm-doc') | 47 | (status,output) = self.target.run('rpm -e rpm-doc') |
diff --git a/meta/lib/oeqa/runtime/scanelf.py b/meta/lib/oeqa/runtime/scanelf.py index b9abf24640..43a024ab9a 100644 --- a/meta/lib/oeqa/runtime/scanelf.py +++ b/meta/lib/oeqa/runtime/scanelf.py | |||
@@ -11,6 +11,7 @@ class ScanelfTest(oeRuntimeTest): | |||
11 | def setUp(self): | 11 | def setUp(self): |
12 | self.scancmd = 'scanelf --quiet --recursive --mount --ldpath --path' | 12 | self.scancmd = 'scanelf --quiet --recursive --mount --ldpath --path' |
13 | 13 | ||
14 | @testcase(966) | ||
14 | @skipUnlessPassed('test_ssh') | 15 | @skipUnlessPassed('test_ssh') |
15 | def test_scanelf_textrel(self): | 16 | def test_scanelf_textrel(self): |
16 | # print TEXTREL information | 17 | # print TEXTREL information |
@@ -18,6 +19,7 @@ class ScanelfTest(oeRuntimeTest): | |||
18 | (status, output) = self.target.run(self.scancmd) | 19 | (status, output) = self.target.run(self.scancmd) |
19 | self.assertEqual(output.strip(), "", "\n".join([self.scancmd, output])) | 20 | self.assertEqual(output.strip(), "", "\n".join([self.scancmd, output])) |
20 | 21 | ||
22 | @testcase(967) | ||
21 | @skipUnlessPassed('test_ssh') | 23 | @skipUnlessPassed('test_ssh') |
22 | def test_scanelf_rpath(self): | 24 | def test_scanelf_rpath(self): |
23 | # print RPATH information | 25 | # print RPATH information |
diff --git a/meta/lib/oeqa/runtime/scp.py b/meta/lib/oeqa/runtime/scp.py index 03095bf966..48e87d2d0b 100644 --- a/meta/lib/oeqa/runtime/scp.py +++ b/meta/lib/oeqa/runtime/scp.py | |||
@@ -1,6 +1,6 @@ | |||
1 | import os | 1 | import os |
2 | from oeqa.oetest import oeRuntimeTest, skipModule | 2 | from oeqa.oetest import oeRuntimeTest, skipModule |
3 | from oeqa.utils.decorators import skipUnlessPassed | 3 | from oeqa.utils.decorators import skipUnlessPassed, testcase |
4 | 4 | ||
5 | def setUpModule(): | 5 | def setUpModule(): |
6 | if not (oeRuntimeTest.hasPackage("dropbear") or oeRuntimeTest.hasPackage("openssh-sshd")): | 6 | if not (oeRuntimeTest.hasPackage("dropbear") or oeRuntimeTest.hasPackage("openssh-sshd")): |
@@ -8,6 +8,7 @@ def setUpModule(): | |||
8 | 8 | ||
9 | class ScpTest(oeRuntimeTest): | 9 | class ScpTest(oeRuntimeTest): |
10 | 10 | ||
11 | @testcase(220) | ||
11 | @skipUnlessPassed('test_ssh') | 12 | @skipUnlessPassed('test_ssh') |
12 | def test_scp_file(self): | 13 | def test_scp_file(self): |
13 | test_log_dir = oeRuntimeTest.tc.d.getVar("TEST_LOG_DIR", True) | 14 | test_log_dir = oeRuntimeTest.tc.d.getVar("TEST_LOG_DIR", True) |
diff --git a/meta/lib/oeqa/runtime/skeletoninit.py b/meta/lib/oeqa/runtime/skeletoninit.py index ddcad203d9..7c7f402e5d 100644 --- a/meta/lib/oeqa/runtime/skeletoninit.py +++ b/meta/lib/oeqa/runtime/skeletoninit.py | |||
@@ -20,6 +20,7 @@ class SkeletonBasicTest(oeRuntimeTest): | |||
20 | (status, output) = self.target.run('ls /usr/sbin/skeleton-test') | 20 | (status, output) = self.target.run('ls /usr/sbin/skeleton-test') |
21 | self.assertEqual(status, 0, msg = "skeleton-test not found. Output:\n%s" % output) | 21 | self.assertEqual(status, 0, msg = "skeleton-test not found. Output:\n%s" % output) |
22 | 22 | ||
23 | @testcase(284) | ||
23 | @skipUnlessPassed('test_skeleton_availability') | 24 | @skipUnlessPassed('test_skeleton_availability') |
24 | @unittest.skipIf("systemd" == oeRuntimeTest.tc.d.getVar("VIRTUAL-RUNTIME_init_manager"), "Not appropiate for systemd image") | 25 | @unittest.skipIf("systemd" == oeRuntimeTest.tc.d.getVar("VIRTUAL-RUNTIME_init_manager"), "Not appropiate for systemd image") |
25 | def test_skeleton_script(self): | 26 | def test_skeleton_script(self): |
diff --git a/meta/lib/oeqa/runtime/smart.py b/meta/lib/oeqa/runtime/smart.py index 3130373f4b..3b49314df7 100644 --- a/meta/lib/oeqa/runtime/smart.py +++ b/meta/lib/oeqa/runtime/smart.py | |||
@@ -25,6 +25,7 @@ class SmartTest(oeRuntimeTest): | |||
25 | 25 | ||
26 | class SmartBasicTest(SmartTest): | 26 | class SmartBasicTest(SmartTest): |
27 | 27 | ||
28 | @testcase(716) | ||
28 | @skipUnlessPassed('test_ssh') | 29 | @skipUnlessPassed('test_ssh') |
29 | def test_smart_help(self): | 30 | def test_smart_help(self): |
30 | self.smart('--help') | 31 | self.smart('--help') |
@@ -32,15 +33,19 @@ class SmartBasicTest(SmartTest): | |||
32 | def test_smart_version(self): | 33 | def test_smart_version(self): |
33 | self.smart('--version') | 34 | self.smart('--version') |
34 | 35 | ||
36 | @testcase(721) | ||
35 | def test_smart_info(self): | 37 | def test_smart_info(self): |
36 | self.smart('info python-smartpm') | 38 | self.smart('info python-smartpm') |
37 | 39 | ||
40 | @testcase(421) | ||
38 | def test_smart_query(self): | 41 | def test_smart_query(self): |
39 | self.smart('query python-smartpm') | 42 | self.smart('query python-smartpm') |
40 | 43 | ||
44 | @testcase(720) | ||
41 | def test_smart_search(self): | 45 | def test_smart_search(self): |
42 | self.smart('search python-smartpm') | 46 | self.smart('search python-smartpm') |
43 | 47 | ||
48 | @testcase(722) | ||
44 | def test_smart_stats(self): | 49 | def test_smart_stats(self): |
45 | self.smart('stats') | 50 | self.smart('stats') |
46 | 51 | ||
@@ -58,6 +63,7 @@ class SmartRepoTest(SmartTest): | |||
58 | def test_smart_channel(self): | 63 | def test_smart_channel(self): |
59 | self.smart('channel', 1) | 64 | self.smart('channel', 1) |
60 | 65 | ||
66 | @testcase(719) | ||
61 | def test_smart_channel_add(self): | 67 | def test_smart_channel_add(self): |
62 | image_pkgtype = self.tc.d.getVar('IMAGE_PKGTYPE', True) | 68 | image_pkgtype = self.tc.d.getVar('IMAGE_PKGTYPE', True) |
63 | deploy_url = 'http://%s:%s/%s' %(self.target.server_ip, self.repo_server.port, image_pkgtype) | 69 | deploy_url = 'http://%s:%s/%s' %(self.target.server_ip, self.repo_server.port, image_pkgtype) |
@@ -76,6 +82,7 @@ class SmartRepoTest(SmartTest): | |||
76 | def test_smart_channel_show(self): | 82 | def test_smart_channel_show(self): |
77 | self.smart('channel --show') | 83 | self.smart('channel --show') |
78 | 84 | ||
85 | @testcase(717) | ||
79 | def test_smart_channel_rpmsys(self): | 86 | def test_smart_channel_rpmsys(self): |
80 | self.smart('channel --show rpmsys') | 87 | self.smart('channel --show rpmsys') |
81 | self.smart('channel --disable rpmsys') | 88 | self.smart('channel --disable rpmsys') |
@@ -86,17 +93,20 @@ class SmartRepoTest(SmartTest): | |||
86 | self.smart('remove -y psplash-default') | 93 | self.smart('remove -y psplash-default') |
87 | self.smart('install -y psplash-default') | 94 | self.smart('install -y psplash-default') |
88 | 95 | ||
96 | @testcase(728) | ||
89 | @skipUnlessPassed('test_smart_install') | 97 | @skipUnlessPassed('test_smart_install') |
90 | def test_smart_install_dependency(self): | 98 | def test_smart_install_dependency(self): |
91 | self.smart('remove -y psplash') | 99 | self.smart('remove -y psplash') |
92 | self.smart('install -y psplash-default') | 100 | self.smart('install -y psplash-default') |
93 | 101 | ||
102 | @testcase(723) | ||
94 | @skipUnlessPassed('test_smart_channel_add') | 103 | @skipUnlessPassed('test_smart_channel_add') |
95 | def test_smart_install_from_disk(self): | 104 | def test_smart_install_from_disk(self): |
96 | self.smart('remove -y psplash-default') | 105 | self.smart('remove -y psplash-default') |
97 | self.smart('download psplash-default') | 106 | self.smart('download psplash-default') |
98 | self.smart('install -y ./psplash-default*') | 107 | self.smart('install -y ./psplash-default*') |
99 | 108 | ||
109 | @testcase(725) | ||
100 | @skipUnlessPassed('test_smart_channel_add') | 110 | @skipUnlessPassed('test_smart_channel_add') |
101 | def test_smart_install_from_http(self): | 111 | def test_smart_install_from_http(self): |
102 | output = self.smart('download --urls psplash-default') | 112 | output = self.smart('download --urls psplash-default') |
@@ -105,6 +115,7 @@ class SmartRepoTest(SmartTest): | |||
105 | self.smart('remove -y psplash-default') | 115 | self.smart('remove -y psplash-default') |
106 | self.smart('install -y %s' % url.group(0)) | 116 | self.smart('install -y %s' % url.group(0)) |
107 | 117 | ||
118 | @testcase(729) | ||
108 | @skipUnlessPassed('test_smart_install') | 119 | @skipUnlessPassed('test_smart_install') |
109 | def test_smart_reinstall(self): | 120 | def test_smart_reinstall(self): |
110 | self.smart('reinstall -y psplash-default') | 121 | self.smart('reinstall -y psplash-default') |
diff --git a/meta/lib/oeqa/runtime/ssh.py b/meta/lib/oeqa/runtime/ssh.py index e64866019f..0e76d5d512 100644 --- a/meta/lib/oeqa/runtime/ssh.py +++ b/meta/lib/oeqa/runtime/ssh.py | |||
@@ -10,6 +10,7 @@ def setUpModule(): | |||
10 | 10 | ||
11 | class SshTest(oeRuntimeTest): | 11 | class SshTest(oeRuntimeTest): |
12 | 12 | ||
13 | @testcase(224) | ||
13 | @skipUnlessPassed('test_ping') | 14 | @skipUnlessPassed('test_ping') |
14 | def test_ssh(self): | 15 | def test_ssh(self): |
15 | (status, output) = self.target.run('uname -a') | 16 | (status, output) = self.target.run('uname -a') |
diff --git a/meta/lib/oeqa/runtime/syslog.py b/meta/lib/oeqa/runtime/syslog.py index b95b36175a..7fa018e97f 100644 --- a/meta/lib/oeqa/runtime/syslog.py +++ b/meta/lib/oeqa/runtime/syslog.py | |||
@@ -13,6 +13,7 @@ class SyslogTest(oeRuntimeTest): | |||
13 | (status,output) = self.target.run('/sbin/syslogd --help') | 13 | (status,output) = self.target.run('/sbin/syslogd --help') |
14 | self.assertEqual(status, 0, msg="status and output: %s and %s" % (status,output)) | 14 | self.assertEqual(status, 0, msg="status and output: %s and %s" % (status,output)) |
15 | 15 | ||
16 | @testcase(201) | ||
16 | @skipUnlessPassed("test_syslog_help") | 17 | @skipUnlessPassed("test_syslog_help") |
17 | def test_syslog_running(self): | 18 | def test_syslog_running(self): |
18 | (status,output) = self.target.run(oeRuntimeTest.pscmd + ' | grep -i [s]yslogd') | 19 | (status,output) = self.target.run(oeRuntimeTest.pscmd + ' | grep -i [s]yslogd') |
@@ -33,6 +34,7 @@ class SyslogTestConfig(oeRuntimeTest): | |||
33 | else: | 34 | else: |
34 | (status,output) = self.target.run('systemctl restart syslog.service') | 35 | (status,output) = self.target.run('systemctl restart syslog.service') |
35 | 36 | ||
37 | @testcase(202) | ||
36 | @skipUnlessPassed("test_syslog_restart") | 38 | @skipUnlessPassed("test_syslog_restart") |
37 | @skipUnlessPassed("test_syslog_logger") | 39 | @skipUnlessPassed("test_syslog_logger") |
38 | @unittest.skipIf("systemd" == oeRuntimeTest.tc.d.getVar("VIRTUAL-RUNTIME_init_manager"), "Not appropiate for systemd image") | 40 | @unittest.skipIf("systemd" == oeRuntimeTest.tc.d.getVar("VIRTUAL-RUNTIME_init_manager"), "Not appropiate for systemd image") |
diff --git a/meta/lib/oeqa/runtime/systemd.py b/meta/lib/oeqa/runtime/systemd.py index 6de84f891b..1451698bb3 100644 --- a/meta/lib/oeqa/runtime/systemd.py +++ b/meta/lib/oeqa/runtime/systemd.py | |||
@@ -28,6 +28,7 @@ class SystemdBasicTests(SystemdTest): | |||
28 | def test_systemd_basic(self): | 28 | def test_systemd_basic(self): |
29 | self.systemctl('--version') | 29 | self.systemctl('--version') |
30 | 30 | ||
31 | @testcase(551) | ||
31 | @skipUnlessPassed('test_system_basic') | 32 | @skipUnlessPassed('test_system_basic') |
32 | def test_systemd_list(self): | 33 | def test_systemd_list(self): |
33 | self.systemctl('list-unit-files') | 34 | self.systemctl('list-unit-files') |
@@ -51,6 +52,7 @@ class SystemdBasicTests(SystemdTest): | |||
51 | return (False, output) | 52 | return (False, output) |
52 | time.sleep(10) | 53 | time.sleep(10) |
53 | 54 | ||
55 | @testcase(550) | ||
54 | @skipUnlessPassed('test_systemd_basic') | 56 | @skipUnlessPassed('test_systemd_basic') |
55 | def test_systemd_failed(self): | 57 | def test_systemd_failed(self): |
56 | settled, output = self.settle() | 58 | settled, output = self.settle() |
@@ -69,6 +71,7 @@ class SystemdServiceTests(SystemdTest): | |||
69 | def test_systemd_status(self): | 71 | def test_systemd_status(self): |
70 | self.systemctl('status --full', 'avahi-daemon.service') | 72 | self.systemctl('status --full', 'avahi-daemon.service') |
71 | 73 | ||
74 | @testcase(695) | ||
72 | @skipUnlessPassed('test_systemd_status') | 75 | @skipUnlessPassed('test_systemd_status') |
73 | def test_systemd_stop_start(self): | 76 | def test_systemd_stop_start(self): |
74 | self.systemctl('stop', 'avahi-daemon.service') | 77 | self.systemctl('stop', 'avahi-daemon.service') |
@@ -76,6 +79,7 @@ class SystemdServiceTests(SystemdTest): | |||
76 | self.systemctl('start','avahi-daemon.service') | 79 | self.systemctl('start','avahi-daemon.service') |
77 | self.systemctl('is-active', 'avahi-daemon.service', verbose=True) | 80 | self.systemctl('is-active', 'avahi-daemon.service', verbose=True) |
78 | 81 | ||
82 | @testcase(696) | ||
79 | @skipUnlessPassed('test_systemd_basic') | 83 | @skipUnlessPassed('test_systemd_basic') |
80 | def test_systemd_disable_enable(self): | 84 | def test_systemd_disable_enable(self): |
81 | self.systemctl('disable', 'avahi-daemon.service') | 85 | self.systemctl('disable', 'avahi-daemon.service') |
diff --git a/meta/lib/oeqa/runtime/vnc.py b/meta/lib/oeqa/runtime/vnc.py index 1b4652b939..f31deff306 100644 --- a/meta/lib/oeqa/runtime/vnc.py +++ b/meta/lib/oeqa/runtime/vnc.py | |||
@@ -7,6 +7,7 @@ def setUpModule(): | |||
7 | 7 | ||
8 | class VNCTest(oeRuntimeTest): | 8 | class VNCTest(oeRuntimeTest): |
9 | 9 | ||
10 | @testcase(213) | ||
10 | @skipUnlessPassed('test_ssh') | 11 | @skipUnlessPassed('test_ssh') |
11 | def test_vnc(self): | 12 | def test_vnc(self): |
12 | (status, output) = self.target.run('x11vnc -display :0 -bg -o x11vnc.log') | 13 | (status, output) = self.target.run('x11vnc -display :0 -bg -o x11vnc.log') |
diff --git a/meta/lib/oeqa/runtime/x32lib.py b/meta/lib/oeqa/runtime/x32lib.py index 6bad201b12..ce5e214035 100644 --- a/meta/lib/oeqa/runtime/x32lib.py +++ b/meta/lib/oeqa/runtime/x32lib.py | |||
@@ -10,6 +10,7 @@ def setUpModule(): | |||
10 | 10 | ||
11 | class X32libTest(oeRuntimeTest): | 11 | class X32libTest(oeRuntimeTest): |
12 | 12 | ||
13 | @testcase(281) | ||
13 | @skipUnlessPassed("test_ssh") | 14 | @skipUnlessPassed("test_ssh") |
14 | def test_x32_file(self): | 15 | def test_x32_file(self): |
15 | status1 = self.target.run("readelf -h /bin/ls | grep Class | grep ELF32")[0] | 16 | status1 = self.target.run("readelf -h /bin/ls | grep Class | grep ELF32")[0] |
diff --git a/meta/lib/oeqa/runtime/xorg.py b/meta/lib/oeqa/runtime/xorg.py index 12dccd8198..7aa61ad6ab 100644 --- a/meta/lib/oeqa/runtime/xorg.py +++ b/meta/lib/oeqa/runtime/xorg.py | |||
@@ -14,6 +14,7 @@ class XorgTest(oeRuntimeTest): | |||
14 | (status, output) = self.target.run(oeRuntimeTest.pscmd + ' | grep -v xinit | grep [X]org') | 14 | (status, output) = self.target.run(oeRuntimeTest.pscmd + ' | grep -v xinit | grep [X]org') |
15 | self.assertEqual(status, 0, msg="Xorg does not appear to be running %s" % self.target.run(oeRuntimeTest.pscmd)[1]) | 15 | self.assertEqual(status, 0, msg="Xorg does not appear to be running %s" % self.target.run(oeRuntimeTest.pscmd)[1]) |
16 | 16 | ||
17 | @testcase(972) | ||
17 | @skipUnlessPassed('test_ssh') | 18 | @skipUnlessPassed('test_ssh') |
18 | def test_xorg_error(self): | 19 | def test_xorg_error(self): |
19 | (status, output) = self.target.run('cat /var/log/Xorg.0.log | grep -v "(EE) error," | grep -v "PreInit" | grep -v "evdev:" | grep -v "glx" | grep "(EE)"') | 20 | (status, output) = self.target.run('cat /var/log/Xorg.0.log | grep -v "(EE) error," | grep -v "PreInit" | grep -v "evdev:" | grep -v "glx" | grep "(EE)"') |