summaryrefslogtreecommitdiffstats
path: root/meta/lib
diff options
context:
space:
mode:
authorAníbal Limón <anibal.limon@linux.intel.com>2016-12-05 16:10:12 -0600
committerRichard Purdie <richard.purdie@linuxfoundation.org>2017-01-23 12:05:19 +0000
commite5f05409d073f089f4e1a78197e5c6cae6e04809 (patch)
treeeb1cff4989d387e27ba4fe5aeb8eed36dbb58d76 /meta/lib
parent260741847a2070a507a8a504bebd457eac99da5f (diff)
downloadpoky-e5f05409d073f089f4e1a78197e5c6cae6e04809.tar.gz
oeqa/runtime: Fix TargetBuildProject instances
TargetBuildProject was refactored to avoid bitbake dependency so the instance don't allow to pass data store anymore. classes/testimage: Export proxies before run tests The TargetBuildProject based tests download archives from network. (From OE-Core rev: e275f29de500a338a02402ecc570405309963b35) Signed-off-by: Aníbal Limón <anibal.limon@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/lib')
-rw-r--r--meta/lib/oeqa/runtime/buildcvs.py9
-rw-r--r--meta/lib/oeqa/runtime/buildgalculator.py8
-rw-r--r--meta/lib/oeqa/runtime/buildiptables.py8
3 files changed, 15 insertions, 10 deletions
diff --git a/meta/lib/oeqa/runtime/buildcvs.py b/meta/lib/oeqa/runtime/buildcvs.py
index fe6cbfbcd5..a5ca3a5b37 100644
--- a/meta/lib/oeqa/runtime/buildcvs.py
+++ b/meta/lib/oeqa/runtime/buildcvs.py
@@ -1,6 +1,6 @@
1from oeqa.oetest import oeRuntimeTest, skipModule 1from oeqa.oetest import oeRuntimeTest, skipModule
2from oeqa.utils.decorators import * 2from oeqa.utils.decorators import *
3from oeqa.utils.targetbuild import TargetBuildProject 3from oeqa.runtime.utils.targetbuildproject import TargetBuildProject
4 4
5def setUpModule(): 5def setUpModule():
6 if not oeRuntimeTest.hasFeature("tools-sdk"): 6 if not oeRuntimeTest.hasFeature("tools-sdk"):
@@ -10,9 +10,10 @@ class BuildCvsTest(oeRuntimeTest):
10 10
11 @classmethod 11 @classmethod
12 def setUpClass(self): 12 def setUpClass(self):
13 self.project = TargetBuildProject(oeRuntimeTest.tc.target, oeRuntimeTest.tc.d, 13 dl_dir = oeRuntimeTest.tc.d.getVar('DL_DIR', True)
14 "http://ftp.gnu.org/non-gnu/cvs/source/feature/1.12.13/cvs-1.12.13.tar.bz2") 14 self.project = TargetBuildProject(oeRuntimeTest.tc.target,
15 self.project.download_archive() 15 "http://ftp.gnu.org/non-gnu/cvs/source/feature/1.12.13/cvs-1.12.13.tar.bz2",
16 dl_dir=dl_dir)
16 17
17 @testcase(205) 18 @testcase(205)
18 @skipUnlessPassed("test_ssh") 19 @skipUnlessPassed("test_ssh")
diff --git a/meta/lib/oeqa/runtime/buildgalculator.py b/meta/lib/oeqa/runtime/buildgalculator.py
index 220101d55c..20f0a79367 100644
--- a/meta/lib/oeqa/runtime/buildgalculator.py
+++ b/meta/lib/oeqa/runtime/buildgalculator.py
@@ -1,6 +1,6 @@
1from oeqa.oetest import oeRuntimeTest, skipModule 1from oeqa.oetest import oeRuntimeTest, skipModule
2from oeqa.utils.decorators import * 2from oeqa.utils.decorators import *
3from oeqa.utils.targetbuild import TargetBuildProject 3from oeqa.runtime.utils.targetbuildproject import TargetBuildProject
4 4
5def setUpModule(): 5def setUpModule():
6 if not oeRuntimeTest.hasFeature("tools-sdk"): 6 if not oeRuntimeTest.hasFeature("tools-sdk"):
@@ -10,9 +10,11 @@ class GalculatorTest(oeRuntimeTest):
10 @testcase(1526) 10 @testcase(1526)
11 @skipUnlessPassed("test_ssh") 11 @skipUnlessPassed("test_ssh")
12 def test_galculator(self): 12 def test_galculator(self):
13 dl_dir = oeRuntimeTest.tc.d.getVar('DL_DIR', True)
13 try: 14 try:
14 project = TargetBuildProject(oeRuntimeTest.tc.target, oeRuntimeTest.tc.d, 15 project = TargetBuildProject(oeRuntimeTest.tc.target,
15 "http://galculator.mnim.org/downloads/galculator-2.1.4.tar.bz2") 16 "http://galculator.mnim.org/downloads/galculator-2.1.4.tar.bz2",
17 dl_dir=dl_dir)
16 project.download_archive() 18 project.download_archive()
17 19
18 self.assertEqual(project.run_configure(), 0, 20 self.assertEqual(project.run_configure(), 0,
diff --git a/meta/lib/oeqa/runtime/buildiptables.py b/meta/lib/oeqa/runtime/buildiptables.py
index bc75d0a0c7..a0e82f0dde 100644
--- a/meta/lib/oeqa/runtime/buildiptables.py
+++ b/meta/lib/oeqa/runtime/buildiptables.py
@@ -1,6 +1,6 @@
1from oeqa.oetest import oeRuntimeTest, skipModule 1from oeqa.oetest import oeRuntimeTest, skipModule
2from oeqa.utils.decorators import * 2from oeqa.utils.decorators import *
3from oeqa.utils.targetbuild import TargetBuildProject 3from oeqa.runtime.utils.targetbuildproject import TargetBuildProject
4 4
5def setUpModule(): 5def setUpModule():
6 if not oeRuntimeTest.hasFeature("tools-sdk"): 6 if not oeRuntimeTest.hasFeature("tools-sdk"):
@@ -10,8 +10,10 @@ class BuildIptablesTest(oeRuntimeTest):
10 10
11 @classmethod 11 @classmethod
12 def setUpClass(self): 12 def setUpClass(self):
13 self.project = TargetBuildProject(oeRuntimeTest.tc.target, oeRuntimeTest.tc.d, 13 dl_dir = oeRuntimeTest.tc.d.getVar('DL_DIR', True)
14 "http://downloads.yoctoproject.org/mirror/sources/iptables-1.4.13.tar.bz2") 14 self.project = TargetBuildProject(oeRuntimeTest.tc.target,
15 "http://downloads.yoctoproject.org/mirror/sources/iptables-1.4.13.tar.bz2",
16 dl_dir=dl_dir)
15 self.project.download_archive() 17 self.project.download_archive()
16 18
17 @testcase(206) 19 @testcase(206)