diff options
Diffstat (limited to 'meta/lib/oeqa/selftest')
-rw-r--r-- | meta/lib/oeqa/selftest/_toaster.py | 4 | ||||
-rw-r--r-- | meta/lib/oeqa/selftest/devtool.py | 2 | ||||
-rw-r--r-- | meta/lib/oeqa/selftest/pkgdata.py | 56 | ||||
-rw-r--r-- | meta/lib/oeqa/selftest/recipetool.py | 4 | ||||
-rw-r--r-- | meta/lib/oeqa/selftest/sstatetests.py | 4 |
5 files changed, 35 insertions, 35 deletions
diff --git a/meta/lib/oeqa/selftest/_toaster.py b/meta/lib/oeqa/selftest/_toaster.py index c424659fdc..15ea9df9ef 100644 --- a/meta/lib/oeqa/selftest/_toaster.py +++ b/meta/lib/oeqa/selftest/_toaster.py | |||
@@ -2,7 +2,7 @@ import unittest | |||
2 | import os | 2 | import os |
3 | import sys | 3 | import sys |
4 | import shlex, subprocess | 4 | import shlex, subprocess |
5 | import urllib, commands, time, getpass, re, json, shlex | 5 | import urllib.request, urllib.parse, urllib.error, subprocess, time, getpass, re, json, shlex |
6 | 6 | ||
7 | import oeqa.utils.ftools as ftools | 7 | import oeqa.utils.ftools as ftools |
8 | from oeqa.selftest.base import oeSelfTest | 8 | from oeqa.selftest.base import oeSelfTest |
@@ -290,7 +290,7 @@ class Toaster_DB_Tests(ToasterSetup): | |||
290 | layers = Layer.objects.values('id', 'layer_index_url') | 290 | layers = Layer.objects.values('id', 'layer_index_url') |
291 | cnt_err = [] | 291 | cnt_err = [] |
292 | for layer in layers: | 292 | for layer in layers: |
293 | resp = urllib.urlopen(layer['layer_index_url']) | 293 | resp = urllib.request.urlopen(layer['layer_index_url']) |
294 | if (resp.getcode() != 200): | 294 | if (resp.getcode() != 200): |
295 | cnt_err.append(layer['id']) | 295 | cnt_err.append(layer['id']) |
296 | self.assertEqual(len(cnt_err), 0, msg = 'Errors for layer id: %s' % cnt_err) | 296 | self.assertEqual(len(cnt_err), 0, msg = 'Errors for layer id: %s' % cnt_err) |
diff --git a/meta/lib/oeqa/selftest/devtool.py b/meta/lib/oeqa/selftest/devtool.py index 132a73d0ec..d0421e7177 100644 --- a/meta/lib/oeqa/selftest/devtool.py +++ b/meta/lib/oeqa/selftest/devtool.py | |||
@@ -50,7 +50,7 @@ class DevtoolBase(oeSelfTest): | |||
50 | 50 | ||
51 | 51 | ||
52 | missingvars = {} | 52 | missingvars = {} |
53 | for var, value in checkvars.iteritems(): | 53 | for var, value in checkvars.items(): |
54 | if value is not None: | 54 | if value is not None: |
55 | missingvars[var] = value | 55 | missingvars[var] = value |
56 | self.assertEqual(missingvars, {}, 'Some expected variables not found in recipe: %s' % checkvars) | 56 | self.assertEqual(missingvars, {}, 'Some expected variables not found in recipe: %s' % checkvars) |
diff --git a/meta/lib/oeqa/selftest/pkgdata.py b/meta/lib/oeqa/selftest/pkgdata.py index 138b03aadb..5a63f89ff2 100644 --- a/meta/lib/oeqa/selftest/pkgdata.py +++ b/meta/lib/oeqa/selftest/pkgdata.py | |||
@@ -131,15 +131,15 @@ class OePkgdataUtilTests(oeSelfTest): | |||
131 | # Test recipe-space package name | 131 | # Test recipe-space package name |
132 | result = runCmd('oe-pkgdata-util list-pkg-files zlib-dev zlib-doc') | 132 | result = runCmd('oe-pkgdata-util list-pkg-files zlib-dev zlib-doc') |
133 | files = splitoutput(result.output) | 133 | files = splitoutput(result.output) |
134 | self.assertIn('zlib-dev', files.keys(), "listed pkgs. files: %s" %result.output) | 134 | self.assertIn('zlib-dev', list(files.keys()), "listed pkgs. files: %s" %result.output) |
135 | self.assertIn('zlib-doc', files.keys(), "listed pkgs. files: %s" %result.output) | 135 | self.assertIn('zlib-doc', list(files.keys()), "listed pkgs. files: %s" %result.output) |
136 | self.assertIn(os.path.join(includedir, 'zlib.h'), files['zlib-dev']) | 136 | self.assertIn(os.path.join(includedir, 'zlib.h'), files['zlib-dev']) |
137 | self.assertIn(os.path.join(mandir, 'man3/zlib.3'), files['zlib-doc']) | 137 | self.assertIn(os.path.join(mandir, 'man3/zlib.3'), files['zlib-doc']) |
138 | # Test runtime package name | 138 | # Test runtime package name |
139 | result = runCmd('oe-pkgdata-util list-pkg-files -r libz1 libz-dev') | 139 | result = runCmd('oe-pkgdata-util list-pkg-files -r libz1 libz-dev') |
140 | files = splitoutput(result.output) | 140 | files = splitoutput(result.output) |
141 | self.assertIn('libz1', files.keys(), "listed pkgs. files: %s" %result.output) | 141 | self.assertIn('libz1', list(files.keys()), "listed pkgs. files: %s" %result.output) |
142 | self.assertIn('libz-dev', files.keys(), "listed pkgs. files: %s" %result.output) | 142 | self.assertIn('libz-dev', list(files.keys()), "listed pkgs. files: %s" %result.output) |
143 | self.assertGreater(len(files['libz1']), 1) | 143 | self.assertGreater(len(files['libz1']), 1) |
144 | libspec = os.path.join(base_libdir, 'libz.so.1.*') | 144 | libspec = os.path.join(base_libdir, 'libz.so.1.*') |
145 | found = False | 145 | found = False |
@@ -152,12 +152,12 @@ class OePkgdataUtilTests(oeSelfTest): | |||
152 | # Test recipe | 152 | # Test recipe |
153 | result = runCmd('oe-pkgdata-util list-pkg-files -p zlib') | 153 | result = runCmd('oe-pkgdata-util list-pkg-files -p zlib') |
154 | files = splitoutput(result.output) | 154 | files = splitoutput(result.output) |
155 | self.assertIn('zlib-dbg', files.keys(), "listed pkgs. files: %s" %result.output) | 155 | self.assertIn('zlib-dbg', list(files.keys()), "listed pkgs. files: %s" %result.output) |
156 | self.assertIn('zlib-doc', files.keys(), "listed pkgs. files: %s" %result.output) | 156 | self.assertIn('zlib-doc', list(files.keys()), "listed pkgs. files: %s" %result.output) |
157 | self.assertIn('zlib-dev', files.keys(), "listed pkgs. files: %s" %result.output) | 157 | self.assertIn('zlib-dev', list(files.keys()), "listed pkgs. files: %s" %result.output) |
158 | self.assertIn('zlib-staticdev', files.keys(), "listed pkgs. files: %s" %result.output) | 158 | self.assertIn('zlib-staticdev', list(files.keys()), "listed pkgs. files: %s" %result.output) |
159 | self.assertIn('zlib', files.keys(), "listed pkgs. files: %s" %result.output) | 159 | self.assertIn('zlib', list(files.keys()), "listed pkgs. files: %s" %result.output) |
160 | self.assertNotIn('zlib-locale', files.keys(), "listed pkgs. files: %s" %result.output) | 160 | self.assertNotIn('zlib-locale', list(files.keys()), "listed pkgs. files: %s" %result.output) |
161 | # (ignore ptest, might not be there depending on config) | 161 | # (ignore ptest, might not be there depending on config) |
162 | self.assertIn(os.path.join(includedir, 'zlib.h'), files['zlib-dev']) | 162 | self.assertIn(os.path.join(includedir, 'zlib.h'), files['zlib-dev']) |
163 | self.assertIn(os.path.join(mandir, 'man3/zlib.3'), files['zlib-doc']) | 163 | self.assertIn(os.path.join(mandir, 'man3/zlib.3'), files['zlib-doc']) |
@@ -165,36 +165,36 @@ class OePkgdataUtilTests(oeSelfTest): | |||
165 | # Test recipe, runtime | 165 | # Test recipe, runtime |
166 | result = runCmd('oe-pkgdata-util list-pkg-files -p zlib -r') | 166 | result = runCmd('oe-pkgdata-util list-pkg-files -p zlib -r') |
167 | files = splitoutput(result.output) | 167 | files = splitoutput(result.output) |
168 | self.assertIn('libz-dbg', files.keys(), "listed pkgs. files: %s" %result.output) | 168 | self.assertIn('libz-dbg', list(files.keys()), "listed pkgs. files: %s" %result.output) |
169 | self.assertIn('libz-doc', files.keys(), "listed pkgs. files: %s" %result.output) | 169 | self.assertIn('libz-doc', list(files.keys()), "listed pkgs. files: %s" %result.output) |
170 | self.assertIn('libz-dev', files.keys(), "listed pkgs. files: %s" %result.output) | 170 | self.assertIn('libz-dev', list(files.keys()), "listed pkgs. files: %s" %result.output) |
171 | self.assertIn('libz-staticdev', files.keys(), "listed pkgs. files: %s" %result.output) | 171 | self.assertIn('libz-staticdev', list(files.keys()), "listed pkgs. files: %s" %result.output) |
172 | self.assertIn('libz1', files.keys(), "listed pkgs. files: %s" %result.output) | 172 | self.assertIn('libz1', list(files.keys()), "listed pkgs. files: %s" %result.output) |
173 | self.assertNotIn('libz-locale', files.keys(), "listed pkgs. files: %s" %result.output) | 173 | self.assertNotIn('libz-locale', list(files.keys()), "listed pkgs. files: %s" %result.output) |
174 | self.assertIn(os.path.join(includedir, 'zlib.h'), files['libz-dev']) | 174 | self.assertIn(os.path.join(includedir, 'zlib.h'), files['libz-dev']) |
175 | self.assertIn(os.path.join(mandir, 'man3/zlib.3'), files['libz-doc']) | 175 | self.assertIn(os.path.join(mandir, 'man3/zlib.3'), files['libz-doc']) |
176 | self.assertIn(os.path.join(libdir, 'libz.a'), files['libz-staticdev']) | 176 | self.assertIn(os.path.join(libdir, 'libz.a'), files['libz-staticdev']) |
177 | # Test recipe, unpackaged | 177 | # Test recipe, unpackaged |
178 | result = runCmd('oe-pkgdata-util list-pkg-files -p zlib -u') | 178 | result = runCmd('oe-pkgdata-util list-pkg-files -p zlib -u') |
179 | files = splitoutput(result.output) | 179 | files = splitoutput(result.output) |
180 | self.assertIn('zlib-dbg', files.keys(), "listed pkgs. files: %s" %result.output) | 180 | self.assertIn('zlib-dbg', list(files.keys()), "listed pkgs. files: %s" %result.output) |
181 | self.assertIn('zlib-doc', files.keys(), "listed pkgs. files: %s" %result.output) | 181 | self.assertIn('zlib-doc', list(files.keys()), "listed pkgs. files: %s" %result.output) |
182 | self.assertIn('zlib-dev', files.keys(), "listed pkgs. files: %s" %result.output) | 182 | self.assertIn('zlib-dev', list(files.keys()), "listed pkgs. files: %s" %result.output) |
183 | self.assertIn('zlib-staticdev', files.keys(), "listed pkgs. files: %s" %result.output) | 183 | self.assertIn('zlib-staticdev', list(files.keys()), "listed pkgs. files: %s" %result.output) |
184 | self.assertIn('zlib', files.keys(), "listed pkgs. files: %s" %result.output) | 184 | self.assertIn('zlib', list(files.keys()), "listed pkgs. files: %s" %result.output) |
185 | self.assertIn('zlib-locale', files.keys(), "listed pkgs. files: %s" %result.output) # this is the key one | 185 | self.assertIn('zlib-locale', list(files.keys()), "listed pkgs. files: %s" %result.output) # this is the key one |
186 | self.assertIn(os.path.join(includedir, 'zlib.h'), files['zlib-dev']) | 186 | self.assertIn(os.path.join(includedir, 'zlib.h'), files['zlib-dev']) |
187 | self.assertIn(os.path.join(mandir, 'man3/zlib.3'), files['zlib-doc']) | 187 | self.assertIn(os.path.join(mandir, 'man3/zlib.3'), files['zlib-doc']) |
188 | self.assertIn(os.path.join(libdir, 'libz.a'), files['zlib-staticdev']) | 188 | self.assertIn(os.path.join(libdir, 'libz.a'), files['zlib-staticdev']) |
189 | # Test recipe, runtime, unpackaged | 189 | # Test recipe, runtime, unpackaged |
190 | result = runCmd('oe-pkgdata-util list-pkg-files -p zlib -r -u') | 190 | result = runCmd('oe-pkgdata-util list-pkg-files -p zlib -r -u') |
191 | files = splitoutput(result.output) | 191 | files = splitoutput(result.output) |
192 | self.assertIn('libz-dbg', files.keys(), "listed pkgs. files: %s" %result.output) | 192 | self.assertIn('libz-dbg', list(files.keys()), "listed pkgs. files: %s" %result.output) |
193 | self.assertIn('libz-doc', files.keys(), "listed pkgs. files: %s" %result.output) | 193 | self.assertIn('libz-doc', list(files.keys()), "listed pkgs. files: %s" %result.output) |
194 | self.assertIn('libz-dev', files.keys(), "listed pkgs. files: %s" %result.output) | 194 | self.assertIn('libz-dev', list(files.keys()), "listed pkgs. files: %s" %result.output) |
195 | self.assertIn('libz-staticdev', files.keys(), "listed pkgs. files: %s" %result.output) | 195 | self.assertIn('libz-staticdev', list(files.keys()), "listed pkgs. files: %s" %result.output) |
196 | self.assertIn('libz1', files.keys(), "listed pkgs. files: %s" %result.output) | 196 | self.assertIn('libz1', list(files.keys()), "listed pkgs. files: %s" %result.output) |
197 | self.assertIn('libz-locale', files.keys(), "listed pkgs. files: %s" %result.output) # this is the key one | 197 | self.assertIn('libz-locale', list(files.keys()), "listed pkgs. files: %s" %result.output) # this is the key one |
198 | self.assertIn(os.path.join(includedir, 'zlib.h'), files['libz-dev']) | 198 | self.assertIn(os.path.join(includedir, 'zlib.h'), files['libz-dev']) |
199 | self.assertIn(os.path.join(mandir, 'man3/zlib.3'), files['libz-doc']) | 199 | self.assertIn(os.path.join(mandir, 'man3/zlib.3'), files['libz-doc']) |
200 | self.assertIn(os.path.join(libdir, 'libz.a'), files['libz-staticdev']) | 200 | self.assertIn(os.path.join(libdir, 'libz.a'), files['libz-staticdev']) |
diff --git a/meta/lib/oeqa/selftest/recipetool.py b/meta/lib/oeqa/selftest/recipetool.py index e72911b0aa..a93d18e275 100644 --- a/meta/lib/oeqa/selftest/recipetool.py +++ b/meta/lib/oeqa/selftest/recipetool.py | |||
@@ -1,7 +1,7 @@ | |||
1 | import os | 1 | import os |
2 | import logging | 2 | import logging |
3 | import tempfile | 3 | import tempfile |
4 | import urlparse | 4 | import urllib.parse |
5 | 5 | ||
6 | from oeqa.utils.commands import runCmd, bitbake, get_bb_var, create_temp_layer | 6 | from oeqa.utils.commands import runCmd, bitbake, get_bb_var, create_temp_layer |
7 | from oeqa.utils.decorators import testcase | 7 | from oeqa.utils.decorators import testcase |
@@ -471,7 +471,7 @@ class RecipetoolAppendsrcBase(RecipetoolBase): | |||
471 | '''Return the first file:// in SRC_URI for the specified recipe.''' | 471 | '''Return the first file:// in SRC_URI for the specified recipe.''' |
472 | src_uri = get_bb_var('SRC_URI', recipe).split() | 472 | src_uri = get_bb_var('SRC_URI', recipe).split() |
473 | for uri in src_uri: | 473 | for uri in src_uri: |
474 | p = urlparse.urlparse(uri) | 474 | p = urllib.parse.urlparse(uri) |
475 | if p.scheme == 'file': | 475 | if p.scheme == 'file': |
476 | return p.netloc + p.path | 476 | return p.netloc + p.path |
477 | 477 | ||
diff --git a/meta/lib/oeqa/selftest/sstatetests.py b/meta/lib/oeqa/selftest/sstatetests.py index a1e5d33580..cc64c6cb68 100644 --- a/meta/lib/oeqa/selftest/sstatetests.py +++ b/meta/lib/oeqa/selftest/sstatetests.py | |||
@@ -445,14 +445,14 @@ http_proxy = "http://example.com/" | |||
445 | files1 = get_files(topdir + "/tmp-sstatesamehash/stamps/") | 445 | files1 = get_files(topdir + "/tmp-sstatesamehash/stamps/") |
446 | files2 = get_files(topdir + "/tmp-sstatesamehash2/stamps/") | 446 | files2 = get_files(topdir + "/tmp-sstatesamehash2/stamps/") |
447 | # Remove items that are identical in both sets | 447 | # Remove items that are identical in both sets |
448 | for k,v in files1.viewitems() & files2.viewitems(): | 448 | for k,v in files1.items() & files2.items(): |
449 | del files1[k] | 449 | del files1[k] |
450 | del files2[k] | 450 | del files2[k] |
451 | if not files1 and not files2: | 451 | if not files1 and not files2: |
452 | # No changes, so we're done | 452 | # No changes, so we're done |
453 | return | 453 | return |
454 | 454 | ||
455 | for k in files1.viewkeys() | files2.viewkeys(): | 455 | for k in files1.keys() | files2.keys(): |
456 | if k in files1 and k in files2: | 456 | if k in files1 and k in files2: |
457 | print("%s differs:" % k) | 457 | print("%s differs:" % k) |
458 | print(subprocess.check_output(("bitbake-diffsigs", | 458 | print(subprocess.check_output(("bitbake-diffsigs", |