The modules that use skipModule should import it themselves and not rely on somebody else to import it.
Signed-off-by: Lucian Musat <[email protected]> --- meta/lib/oeqa/runtime/buildcvs.py | 2 +- meta/lib/oeqa/runtime/buildiptables.py | 2 +- meta/lib/oeqa/runtime/buildsudoku.py | 2 +- meta/lib/oeqa/runtime/ldd.py | 2 +- meta/lib/oeqa/runtime/pam.py | 8 ++++---- meta/lib/oeqa/runtime/skeletoninit.py | 2 +- meta/lib/oeqa/runtime/smart.py | 2 +- meta/lib/oeqa/runtime/vnc.py | 2 +- 8 files changed, 11 insertions(+), 11 deletions(-) diff --git a/meta/lib/oeqa/runtime/buildcvs.py b/meta/lib/oeqa/runtime/buildcvs.py index f1fbf19..6201ed1 100644 --- a/meta/lib/oeqa/runtime/buildcvs.py +++ b/meta/lib/oeqa/runtime/buildcvs.py @@ -1,4 +1,4 @@ -from oeqa.oetest import oeRuntimeTest +from oeqa.oetest import oeRuntimeTest, skipModule from oeqa.utils.decorators import * from oeqa.utils.targetbuild import TargetBuildProject diff --git a/meta/lib/oeqa/runtime/buildiptables.py b/meta/lib/oeqa/runtime/buildiptables.py index f6061a7..c77b114 100644 --- a/meta/lib/oeqa/runtime/buildiptables.py +++ b/meta/lib/oeqa/runtime/buildiptables.py @@ -1,4 +1,4 @@ -from oeqa.oetest import oeRuntimeTest +from oeqa.oetest import oeRuntimeTest, skipModule from oeqa.utils.decorators import * from oeqa.utils.targetbuild import TargetBuildProject diff --git a/meta/lib/oeqa/runtime/buildsudoku.py b/meta/lib/oeqa/runtime/buildsudoku.py index a754f1d..f51af92 100644 --- a/meta/lib/oeqa/runtime/buildsudoku.py +++ b/meta/lib/oeqa/runtime/buildsudoku.py @@ -1,4 +1,4 @@ -from oeqa.oetest import oeRuntimeTest +from oeqa.oetest import oeRuntimeTest, skipModule from oeqa.utils.decorators import * from oeqa.utils.targetbuild import TargetBuildProject diff --git a/meta/lib/oeqa/runtime/ldd.py b/meta/lib/oeqa/runtime/ldd.py index 4374530..079130f 100644 --- a/meta/lib/oeqa/runtime/ldd.py +++ b/meta/lib/oeqa/runtime/ldd.py @@ -1,5 +1,5 @@ import unittest -from oeqa.oetest import oeRuntimeTest +from oeqa.oetest import oeRuntimeTest, skipModule from oeqa.utils.decorators import * def setUpModule(): diff --git a/meta/lib/oeqa/runtime/pam.py b/meta/lib/oeqa/runtime/pam.py index cc5c1bd..c26e6ea 100644 --- a/meta/lib/oeqa/runtime/pam.py +++ b/meta/lib/oeqa/runtime/pam.py @@ -2,7 +2,7 @@ # Note that the image under test must have "pam" in DISTRO_FEATURES import unittest -from oeqa.oetest import oeRuntimeTest +from oeqa.oetest import oeRuntimeTest, skipModule from oeqa.utils.decorators import * def setUpModule(): @@ -17,8 +17,8 @@ class PamBasicTest(oeRuntimeTest): (status, output) = self.target.run('login --help') self.assertEqual(status, 1, msg = "login command does not work as expected. Status and output:%s and %s" %(status, output)) (status, output) = self.target.run('passwd --help') - self.assertEqual(status, 0, msg = "passwd command does not work as expected. Status and output:%s and %s" %(status, output)) + self.assertEqual(status, 6, msg = "passwd command does not work as expected. Status and output:%s and %s" %(status, output)) (status, output) = self.target.run('su --help') - self.assertEqual(status, 0, msg = "su command does not work as expected. Status and output:%s and %s" %(status, output)) + self.assertEqual(status, 2, msg = "su command does not work as expected. Status and output:%s and %s" %(status, output)) (status, output) = self.target.run('useradd --help') - self.assertEqual(status, 0, msg = "useradd command does not work as expected. Status and output:%s and %s" %(status, output)) + 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 557e715..ddcad20 100644 --- a/meta/lib/oeqa/runtime/skeletoninit.py +++ b/meta/lib/oeqa/runtime/skeletoninit.py @@ -2,7 +2,7 @@ # Note that the image under test must have meta-skeleton layer in bblayers and IMAGE_INSTALL_append = " service" in local.conf import unittest -from oeqa.oetest import oeRuntimeTest +from oeqa.oetest import oeRuntimeTest, skipModule from oeqa.utils.decorators import * def setUpModule(): diff --git a/meta/lib/oeqa/runtime/smart.py b/meta/lib/oeqa/runtime/smart.py index 195f117..3130373 100644 --- a/meta/lib/oeqa/runtime/smart.py +++ b/meta/lib/oeqa/runtime/smart.py @@ -1,6 +1,6 @@ import unittest import re -from oeqa.oetest import oeRuntimeTest +from oeqa.oetest import oeRuntimeTest, skipModule from oeqa.utils.decorators import * from oeqa.utils.httpserver import HTTPService diff --git a/meta/lib/oeqa/runtime/vnc.py b/meta/lib/oeqa/runtime/vnc.py index 5ed1072..1b4652b 100644 --- a/meta/lib/oeqa/runtime/vnc.py +++ b/meta/lib/oeqa/runtime/vnc.py @@ -1,4 +1,4 @@ -from oeqa.oetest import oeRuntimeTest +from oeqa.oetest import oeRuntimeTest, skipModuleUnless from oeqa.utils.decorators import * import re -- 1.9.1 -- _______________________________________________ Openembedded-core mailing list [email protected] http://lists.openembedded.org/mailman/listinfo/openembedded-core
