summaryrefslogtreecommitdiffstats
path: root/meta/lib/oeqa/selftest
diff options
context:
space:
mode:
authorRichard Purdie <richard.purdie@linuxfoundation.org>2016-05-20 11:49:34 +0100
committerRichard Purdie <richard.purdie@linuxfoundation.org>2016-06-02 08:24:00 +0100
commit8587bce564f715e46e7317218b5c190813d3a939 (patch)
treed67f45ca7d88f1ea1dcfc436a82763fa6c39a686 /meta/lib/oeqa/selftest
parenta7309d5790f5dac46e84d3c14959943eb2496fda (diff)
downloadpoky-8587bce564f715e46e7317218b5c190813d3a939.tar.gz
classes/lib: Update to match python3 iter requirements
python3 standardises its use of iteration operations. Update the code to match the for python3 requires. (From OE-Core rev: 2476bdcbef591e951d11d57d53f1315848758571) Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/lib/oeqa/selftest')
-rw-r--r--meta/lib/oeqa/selftest/devtool.py2
-rw-r--r--meta/lib/oeqa/selftest/sstatetests.py4
2 files changed, 3 insertions, 3 deletions
diff --git a/meta/lib/oeqa/selftest/devtool.py b/meta/lib/oeqa/selftest/devtool.py
index b64f9b3e76..6d2417ee4f 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/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",