diff options
Diffstat (limited to 'meta/lib/oeqa/runtime/_ptest.py')
-rw-r--r-- | meta/lib/oeqa/runtime/_ptest.py | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/meta/lib/oeqa/runtime/_ptest.py b/meta/lib/oeqa/runtime/_ptest.py index 71324d3da2..cfb4041f18 100644 --- a/meta/lib/oeqa/runtime/_ptest.py +++ b/meta/lib/oeqa/runtime/_ptest.py | |||
@@ -13,7 +13,7 @@ def setUpModule(): | |||
13 | skipModule("Image doesn't have package management feature") | 13 | skipModule("Image doesn't have package management feature") |
14 | if not oeRuntimeTest.hasPackage("smartpm"): | 14 | if not oeRuntimeTest.hasPackage("smartpm"): |
15 | skipModule("Image doesn't have smart installed") | 15 | skipModule("Image doesn't have smart installed") |
16 | if "package_rpm" != oeRuntimeTest.tc.d.getVar("PACKAGE_CLASSES", True).split()[0]: | 16 | if "package_rpm" != oeRuntimeTest.tc.d.getVar("PACKAGE_CLASSES").split()[0]: |
17 | skipModule("Rpm is not the primary package manager") | 17 | skipModule("Rpm is not the primary package manager") |
18 | 18 | ||
19 | class PtestRunnerTest(oeRuntimeTest): | 19 | class PtestRunnerTest(oeRuntimeTest): |
@@ -57,7 +57,7 @@ class PtestRunnerTest(oeRuntimeTest): | |||
57 | # (status, result) = oeRuntimeTest.tc.target.run('smart channel --show | grep "\["', 0) | 57 | # (status, result) = oeRuntimeTest.tc.target.run('smart channel --show | grep "\["', 0) |
58 | # for x in result.split("\n"): | 58 | # for x in result.split("\n"): |
59 | # self.existingchannels.add(x) | 59 | # self.existingchannels.add(x) |
60 | self.repo_server = HTTPService(oeRuntimeTest.tc.d.getVar('DEPLOY_DIR', True), oeRuntimeTest.tc.target.server_ip) | 60 | self.repo_server = HTTPService(oeRuntimeTest.tc.d.getVar('DEPLOY_DIR'), oeRuntimeTest.tc.target.server_ip) |
61 | self.repo_server.start() | 61 | self.repo_server.start() |
62 | 62 | ||
63 | @classmethod | 63 | @classmethod |
@@ -70,23 +70,23 @@ class PtestRunnerTest(oeRuntimeTest): | |||
70 | # oeRuntimeTest.tc.target.run('smart channel --remove '+x[1:-1]+' -y', 0) | 70 | # oeRuntimeTest.tc.target.run('smart channel --remove '+x[1:-1]+' -y', 0) |
71 | 71 | ||
72 | def add_smart_channel(self): | 72 | def add_smart_channel(self): |
73 | image_pkgtype = self.tc.d.getVar('IMAGE_PKGTYPE', True) | 73 | image_pkgtype = self.tc.d.getVar('IMAGE_PKGTYPE') |
74 | deploy_url = 'http://%s:%s/%s' %(self.target.server_ip, self.repo_server.port, image_pkgtype) | 74 | deploy_url = 'http://%s:%s/%s' %(self.target.server_ip, self.repo_server.port, image_pkgtype) |
75 | pkgarchs = self.tc.d.getVar('PACKAGE_ARCHS', True).replace("-","_").split() | 75 | pkgarchs = self.tc.d.getVar('PACKAGE_ARCHS').replace("-","_").split() |
76 | for arch in os.listdir('%s/%s' % (self.repo_server.root_dir, image_pkgtype)): | 76 | for arch in os.listdir('%s/%s' % (self.repo_server.root_dir, image_pkgtype)): |
77 | if arch in pkgarchs: | 77 | if arch in pkgarchs: |
78 | self.target.run('smart channel -y --add {a} type=rpm-md baseurl={u}/{a}'.format(a=arch, u=deploy_url), 0) | 78 | self.target.run('smart channel -y --add {a} type=rpm-md baseurl={u}/{a}'.format(a=arch, u=deploy_url), 0) |
79 | self.target.run('smart update', 0) | 79 | self.target.run('smart update', 0) |
80 | 80 | ||
81 | def install_complementary(self, globs=None): | 81 | def install_complementary(self, globs=None): |
82 | installed_pkgs_file = os.path.join(oeRuntimeTest.tc.d.getVar('WORKDIR', True), | 82 | installed_pkgs_file = os.path.join(oeRuntimeTest.tc.d.getVar('WORKDIR'), |
83 | "installed_pkgs.txt") | 83 | "installed_pkgs.txt") |
84 | self.pkgs_list = RpmPkgsList(oeRuntimeTest.tc.d, oeRuntimeTest.tc.d.getVar('IMAGE_ROOTFS', True), oeRuntimeTest.tc.d.getVar('arch_var', True), oeRuntimeTest.tc.d.getVar('os_var', True)) | 84 | self.pkgs_list = RpmPkgsList(oeRuntimeTest.tc.d, oeRuntimeTest.tc.d.getVar('IMAGE_ROOTFS'), oeRuntimeTest.tc.d.getVar('arch_var'), oeRuntimeTest.tc.d.getVar('os_var')) |
85 | with open(installed_pkgs_file, "w+") as installed_pkgs: | 85 | with open(installed_pkgs_file, "w+") as installed_pkgs: |
86 | installed_pkgs.write(self.pkgs_list.list("arch")) | 86 | installed_pkgs.write(self.pkgs_list.list("arch")) |
87 | 87 | ||
88 | cmd = [bb.utils.which(os.getenv('PATH'), "oe-pkgdata-util"), | 88 | cmd = [bb.utils.which(os.getenv('PATH'), "oe-pkgdata-util"), |
89 | "-p", oeRuntimeTest.tc.d.getVar('PKGDATA_DIR', True), "glob", installed_pkgs_file, | 89 | "-p", oeRuntimeTest.tc.d.getVar('PKGDATA_DIR'), "glob", installed_pkgs_file, |
90 | globs] | 90 | globs] |
91 | try: | 91 | try: |
92 | bb.note("Installing complementary packages ...") | 92 | bb.note("Installing complementary packages ...") |
@@ -99,7 +99,7 @@ class PtestRunnerTest(oeRuntimeTest): | |||
99 | return complementary_pkgs.split() | 99 | return complementary_pkgs.split() |
100 | 100 | ||
101 | def setUpLocal(self): | 101 | def setUpLocal(self): |
102 | self.ptest_log = os.path.join(oeRuntimeTest.tc.d.getVar("TEST_LOG_DIR",True), "ptest-%s.log" % oeRuntimeTest.tc.d.getVar('DATETIME', True)) | 102 | self.ptest_log = os.path.join(oeRuntimeTest.tc.d.getVar("TEST_LOG_DIR",True), "ptest-%s.log" % oeRuntimeTest.tc.d.getVar('DATETIME')) |
103 | 103 | ||
104 | @skipUnlessPassed('test_ssh') | 104 | @skipUnlessPassed('test_ssh') |
105 | def test_ptestrunner(self): | 105 | def test_ptestrunner(self): |