From b8f704285f2e00b30f5007217b8575e0820953f1 Mon Sep 17 00:00:00 2001 From: Mariano Lopez Date: Thu, 15 Oct 2015 06:29:38 +0000 Subject: oeqa/runtime: Fix setUp and tearDown methods Currently some of the runtime test overwrites the setUp and tearDown methods provided by oeRuntimeTest, this will avoid some checks required when running the test suit. This patch changes the setUp and tearDown methods for their local counterparts, so when these tests are called, it will run the parent setUp and tearDown and also the local ones. [YOCTO #8465] (From OE-Core rev: 13282223b07787a92c251f89251e8a49a0e4e3eb) Signed-off-by: Mariano Lopez Signed-off-by: Ross Burton Signed-off-by: Richard Purdie --- meta/lib/oeqa/runtime/_ptest.py | 2 +- meta/lib/oeqa/runtime/date.py | 4 ++-- meta/lib/oeqa/runtime/kernelmodule.py | 4 ++-- meta/lib/oeqa/runtime/scanelf.py | 2 +- 4 files changed, 6 insertions(+), 6 deletions(-) (limited to 'meta') diff --git a/meta/lib/oeqa/runtime/_ptest.py b/meta/lib/oeqa/runtime/_ptest.py index 81c9c43862..0621028b86 100644 --- a/meta/lib/oeqa/runtime/_ptest.py +++ b/meta/lib/oeqa/runtime/_ptest.py @@ -98,7 +98,7 @@ class PtestRunnerTest(oeRuntimeTest): return complementary_pkgs.split() - def setUp(self): + def setUpLocal(self): self.ptest_log = os.path.join(oeRuntimeTest.tc.d.getVar("TEST_LOG_DIR",True), "ptest-%s.log" % oeRuntimeTest.tc.d.getVar('DATETIME', True)) @skipUnlessPassed('test_ssh') diff --git a/meta/lib/oeqa/runtime/date.py b/meta/lib/oeqa/runtime/date.py index 3a8fe84817..447987e075 100644 --- a/meta/lib/oeqa/runtime/date.py +++ b/meta/lib/oeqa/runtime/date.py @@ -4,11 +4,11 @@ import re class DateTest(oeRuntimeTest): - def setUp(self): + def setUpLocal(self): if oeRuntimeTest.tc.d.getVar("VIRTUAL-RUNTIME_init_manager", True) == "systemd": self.target.run('systemctl stop systemd-timesyncd') - def tearDown(self): + def tearDownLocal(self): if oeRuntimeTest.tc.d.getVar("VIRTUAL-RUNTIME_init_manager", True) == "systemd": self.target.run('systemctl start systemd-timesyncd') diff --git a/meta/lib/oeqa/runtime/kernelmodule.py b/meta/lib/oeqa/runtime/kernelmodule.py index 2e81720327..38ca184540 100644 --- a/meta/lib/oeqa/runtime/kernelmodule.py +++ b/meta/lib/oeqa/runtime/kernelmodule.py @@ -10,7 +10,7 @@ def setUpModule(): class KernelModuleTest(oeRuntimeTest): - def setUp(self): + def setUpLocal(self): self.target.copy_to(os.path.join(oeRuntimeTest.tc.filesdir, "hellomod.c"), "/tmp/hellomod.c") self.target.copy_to(os.path.join(oeRuntimeTest.tc.filesdir, "hellomod_makefile"), "/tmp/Makefile") @@ -30,5 +30,5 @@ class KernelModuleTest(oeRuntimeTest): (status, output) = self.target.run(cmd, 900) self.assertEqual(status, 0, msg="\n".join([cmd, output])) - def tearDown(self): + def tearDownLocal(self): self.target.run('rm -f /tmp/Makefile /tmp/hellomod.c') diff --git a/meta/lib/oeqa/runtime/scanelf.py b/meta/lib/oeqa/runtime/scanelf.py index 43a024ab9a..67e02ff455 100644 --- a/meta/lib/oeqa/runtime/scanelf.py +++ b/meta/lib/oeqa/runtime/scanelf.py @@ -8,7 +8,7 @@ def setUpModule(): class ScanelfTest(oeRuntimeTest): - def setUp(self): + def setUpLocal(self): self.scancmd = 'scanelf --quiet --recursive --mount --ldpath --path' @testcase(966) -- cgit v1.2.3-54-g00ecf