summaryrefslogtreecommitdiffstats
path: root/meta
diff options
context:
space:
mode:
authorLucian Musat <georgex.l.musat@intel.com>2014-07-24 15:41:25 +0300
committerRichard Purdie <richard.purdie@linuxfoundation.org>2014-07-25 15:34:00 +0100
commit984f03457adced77482f9c3f0b95349c9b17c7e5 (patch)
tree91b414a4d8a08121362ae8b0b370e7d45fddf069 /meta
parent0c4dd0ad168e138ba96eaf27aa7e513aaf6704ee (diff)
downloadpoky-984f03457adced77482f9c3f0b95349c9b17c7e5.tar.gz
oeqa/runtime: Added skipModule import for test modules that use it.
The modules that use skipModule should import it themselves and not rely on somebody else to import it. (From OE-Core rev: 6a14db407d471e717f41342ac0700e6a383c32c3) Signed-off-by: Lucian Musat <georgex.l.musat@intel.com> Signed-off-by: Saul Wold <sgw@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
-rw-r--r--meta/lib/oeqa/runtime/buildcvs.py2
-rw-r--r--meta/lib/oeqa/runtime/buildiptables.py2
-rw-r--r--meta/lib/oeqa/runtime/buildsudoku.py2
-rw-r--r--meta/lib/oeqa/runtime/ldd.py2
-rw-r--r--meta/lib/oeqa/runtime/pam.py8
-rw-r--r--meta/lib/oeqa/runtime/skeletoninit.py2
-rw-r--r--meta/lib/oeqa/runtime/smart.py2
-rw-r--r--meta/lib/oeqa/runtime/vnc.py2
8 files changed, 11 insertions, 11 deletions
diff --git a/meta/lib/oeqa/runtime/buildcvs.py b/meta/lib/oeqa/runtime/buildcvs.py
index f1fbf19c1f..6201ed1a43 100644
--- a/meta/lib/oeqa/runtime/buildcvs.py
+++ b/meta/lib/oeqa/runtime/buildcvs.py
@@ -1,4 +1,4 @@
1from oeqa.oetest import oeRuntimeTest 1from oeqa.oetest import oeRuntimeTest, skipModule
2from oeqa.utils.decorators import * 2from oeqa.utils.decorators import *
3from oeqa.utils.targetbuild import TargetBuildProject 3from oeqa.utils.targetbuild import TargetBuildProject
4 4
diff --git a/meta/lib/oeqa/runtime/buildiptables.py b/meta/lib/oeqa/runtime/buildiptables.py
index f6061a7f98..c77b11452c 100644
--- a/meta/lib/oeqa/runtime/buildiptables.py
+++ b/meta/lib/oeqa/runtime/buildiptables.py
@@ -1,4 +1,4 @@
1from oeqa.oetest import oeRuntimeTest 1from oeqa.oetest import oeRuntimeTest, skipModule
2from oeqa.utils.decorators import * 2from oeqa.utils.decorators import *
3from oeqa.utils.targetbuild import TargetBuildProject 3from oeqa.utils.targetbuild import TargetBuildProject
4 4
diff --git a/meta/lib/oeqa/runtime/buildsudoku.py b/meta/lib/oeqa/runtime/buildsudoku.py
index a754f1d9ea..f51af92ec6 100644
--- a/meta/lib/oeqa/runtime/buildsudoku.py
+++ b/meta/lib/oeqa/runtime/buildsudoku.py
@@ -1,4 +1,4 @@
1from oeqa.oetest import oeRuntimeTest 1from oeqa.oetest import oeRuntimeTest, skipModule
2from oeqa.utils.decorators import * 2from oeqa.utils.decorators import *
3from oeqa.utils.targetbuild import TargetBuildProject 3from oeqa.utils.targetbuild import TargetBuildProject
4 4
diff --git a/meta/lib/oeqa/runtime/ldd.py b/meta/lib/oeqa/runtime/ldd.py
index 4374530fc4..079130f833 100644
--- a/meta/lib/oeqa/runtime/ldd.py
+++ b/meta/lib/oeqa/runtime/ldd.py
@@ -1,5 +1,5 @@
1import unittest 1import unittest
2from oeqa.oetest import oeRuntimeTest 2from oeqa.oetest import oeRuntimeTest, skipModule
3from oeqa.utils.decorators import * 3from oeqa.utils.decorators import *
4 4
5def setUpModule(): 5def setUpModule():
diff --git a/meta/lib/oeqa/runtime/pam.py b/meta/lib/oeqa/runtime/pam.py
index cc5c1bd7a1..c26e6ea849 100644
--- a/meta/lib/oeqa/runtime/pam.py
+++ b/meta/lib/oeqa/runtime/pam.py
@@ -2,7 +2,7 @@
2# Note that the image under test must have "pam" in DISTRO_FEATURES 2# Note that the image under test must have "pam" in DISTRO_FEATURES
3 3
4import unittest 4import unittest
5from oeqa.oetest import oeRuntimeTest 5from oeqa.oetest import oeRuntimeTest, skipModule
6from oeqa.utils.decorators import * 6from oeqa.utils.decorators import *
7 7
8def setUpModule(): 8def setUpModule():
@@ -17,8 +17,8 @@ class PamBasicTest(oeRuntimeTest):
17 (status, output) = self.target.run('login --help') 17 (status, output) = self.target.run('login --help')
18 self.assertEqual(status, 1, msg = "login command does not work as expected. Status and output:%s and %s" %(status, output)) 18 self.assertEqual(status, 1, msg = "login command does not work as expected. Status and output:%s and %s" %(status, output))
19 (status, output) = self.target.run('passwd --help') 19 (status, output) = self.target.run('passwd --help')
20 self.assertEqual(status, 0, msg = "passwd command does not work as expected. Status and output:%s and %s" %(status, output)) 20 self.assertEqual(status, 6, msg = "passwd command does not work as expected. Status and output:%s and %s" %(status, output))
21 (status, output) = self.target.run('su --help') 21 (status, output) = self.target.run('su --help')
22 self.assertEqual(status, 0, msg = "su command does not work as expected. Status and output:%s and %s" %(status, output)) 22 self.assertEqual(status, 2, msg = "su command does not work as expected. Status and output:%s and %s" %(status, output))
23 (status, output) = self.target.run('useradd --help') 23 (status, output) = self.target.run('useradd --help')
24 self.assertEqual(status, 0, msg = "useradd command does not work as expected. Status and output:%s and %s" %(status, output)) 24 self.assertEqual(status, 2, msg = "useradd command does not work as expected. Status and output:%s and %s" %(status, output))
diff --git a/meta/lib/oeqa/runtime/skeletoninit.py b/meta/lib/oeqa/runtime/skeletoninit.py
index 557e715a3e..ddcad203d9 100644
--- a/meta/lib/oeqa/runtime/skeletoninit.py
+++ b/meta/lib/oeqa/runtime/skeletoninit.py
@@ -2,7 +2,7 @@
2# Note that the image under test must have meta-skeleton layer in bblayers and IMAGE_INSTALL_append = " service" in local.conf 2# Note that the image under test must have meta-skeleton layer in bblayers and IMAGE_INSTALL_append = " service" in local.conf
3 3
4import unittest 4import unittest
5from oeqa.oetest import oeRuntimeTest 5from oeqa.oetest import oeRuntimeTest, skipModule
6from oeqa.utils.decorators import * 6from oeqa.utils.decorators import *
7 7
8def setUpModule(): 8def setUpModule():
diff --git a/meta/lib/oeqa/runtime/smart.py b/meta/lib/oeqa/runtime/smart.py
index 195f1170c6..3130373f4b 100644
--- a/meta/lib/oeqa/runtime/smart.py
+++ b/meta/lib/oeqa/runtime/smart.py
@@ -1,6 +1,6 @@
1import unittest 1import unittest
2import re 2import re
3from oeqa.oetest import oeRuntimeTest 3from oeqa.oetest import oeRuntimeTest, skipModule
4from oeqa.utils.decorators import * 4from oeqa.utils.decorators import *
5from oeqa.utils.httpserver import HTTPService 5from oeqa.utils.httpserver import HTTPService
6 6
diff --git a/meta/lib/oeqa/runtime/vnc.py b/meta/lib/oeqa/runtime/vnc.py
index 5ed10727bc..1b4652b939 100644
--- a/meta/lib/oeqa/runtime/vnc.py
+++ b/meta/lib/oeqa/runtime/vnc.py
@@ -1,4 +1,4 @@
1from oeqa.oetest import oeRuntimeTest 1from oeqa.oetest import oeRuntimeTest, skipModuleUnless
2from oeqa.utils.decorators import * 2from oeqa.utils.decorators import *
3import re 3import re
4 4