From: Richard Purdie <richard.purdie@linuxfoundation.org>
To: bitbake-devel <bitbake-devel@lists.openembedded.org>
Subject: [PATCH] tests: assertEquals -> assertEqual
Date: Mon, 09 May 2016 14:03:41 +0100 [thread overview]
Message-ID: <1462799021.21831.130.camel@linuxfoundation.org> (raw)
The preferred form is assertEqaual, assertEquals is deprecated and
not present in python v3.
This is v2.7 safe.
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
diff --git a/bitbake/lib/bb/tests/codeparser.py b/bitbake/lib/bb/tests/codeparser.py
index bb820e4..5ea9d84 100644
--- a/bitbake/lib/bb/tests/codeparser.py
+++ b/bitbake/lib/bb/tests/codeparser.py
@@ -302,7 +302,7 @@ bb.data.getVar(a(), d, False)
deps, values = bb.data.build_dependencies("FOO", set(self.d.keys()), set(), set(), self.d)
- self.assertEquals(deps, set(["somevar", "bar", "something", "inexpand", "test", "test2", "a"]))
+ self.assertEqual(deps, set(["somevar", "bar", "something", "inexpand", "test", "test2", "a"]))
shelldata = """
@@ -349,7 +349,7 @@ esac
deps, values = bb.data.build_dependencies("FOO", set(self.d.keys()), set(), set(), self.d)
- self.assertEquals(deps, set(["somevar", "inverted"] + execs))
+ self.assertEqual(deps, set(["somevar", "inverted"] + execs))
def test_vardeps(self):
@@ -359,7 +359,7 @@ esac
deps, values = bb.data.build_dependencies("FOO", set(self.d.keys()), set(), set(), self.d)
- self.assertEquals(deps, set(["oe_libinstall"]))
+ self.assertEqual(deps, set(["oe_libinstall"]))
def test_vardeps_expand(self):
self.d.setVar("oe_libinstall", "echo test")
@@ -368,7 +368,7 @@ esac
deps, values = bb.data.build_dependencies("FOO", set(self.d.keys()), set(), set(), self.d)
- self.assertEquals(deps, set(["oe_libinstall"]))
+ self.assertEqual(deps, set(["oe_libinstall"]))
#Currently no wildcard support
#def test_vardeps_wildcards(self):
diff --git a/bitbake/lib/bb/tests/cow.py b/bitbake/lib/bb/tests/cow.py
index 35c5841..d149d84 100644
--- a/bitbake/lib/bb/tests/cow.py
+++ b/bitbake/lib/bb/tests/cow.py
@@ -34,14 +34,14 @@ class COWTestCase(unittest.TestCase):
from bb.COW import COWDictBase
a = COWDictBase.copy()
- self.assertEquals(False, a.has_key('a'))
+ self.assertEqual(False, 'a' in a)
a['a'] = 'a'
a['b'] = 'b'
- self.assertEquals(True, a.has_key('a'))
- self.assertEquals(True, a.has_key('b'))
- self.assertEquals('a', a['a'] )
- self.assertEquals('b', a['b'] )
+ self.assertEqual(True, 'a' in a)
+ self.assertEqual(True, 'b' in a)
+ self.assertEqual('a', a['a'] )
+ self.assertEqual('b', a['b'] )
def testCopyCopy(self):
"""
@@ -60,31 +60,31 @@ class COWTestCase(unittest.TestCase):
c['a'] = 30
# test separation of the two instances
- self.assertEquals(False, c.has_key('c'))
- self.assertEquals(30, c['a'])
- self.assertEquals(10, b['a'])
+ self.assertEqual(False, 'c' in c)
+ self.assertEqual(30, c['a'])
+ self.assertEqual(10, b['a'])
# test copy
b_2 = b.copy()
c_2 = c.copy()
- self.assertEquals(False, c_2.has_key('c'))
- self.assertEquals(10, b_2['a'])
+ self.assertEqual(False, 'c' in c_2)
+ self.assertEqual(10, b_2['a'])
b_2['d'] = 40
- self.assertEquals(False, c_2.has_key('d'))
- self.assertEquals(True, b_2.has_key('d'))
- self.assertEquals(40, b_2['d'])
- self.assertEquals(False, b.has_key('d'))
- self.assertEquals(False, c.has_key('d'))
+ self.assertEqual(False, 'd' in c_2)
+ self.assertEqual(True, 'd' in b_2)
+ self.assertEqual(40, b_2['d'])
+ self.assertEqual(False, 'd' in b)
+ self.assertEqual(False, 'd' in c)
c_2['d'] = 30
- self.assertEquals(True, c_2.has_key('d'))
- self.assertEquals(True, b_2.has_key('d'))
- self.assertEquals(30, c_2['d'])
- self.assertEquals(40, b_2['d'])
- self.assertEquals(False, b.has_key('d'))
- self.assertEquals(False, c.has_key('d'))
+ self.assertEqual(True, 'd' in c_2)
+ self.assertEqual(True, 'd' in b_2)
+ self.assertEqual(30, c_2['d'])
+ self.assertEqual(40, b_2['d'])
+ self.assertEqual(False, 'd' in b)
+ self.assertEqual(False, 'd' in c)
# test copy of the copy
c_3 = c_2.copy()
@@ -92,19 +92,19 @@ class COWTestCase(unittest.TestCase):
b_3_2 = b_2.copy()
c_3['e'] = 4711
- self.assertEquals(4711, c_3['e'])
- self.assertEquals(False, c_2.has_key('e'))
- self.assertEquals(False, b_3.has_key('e'))
- self.assertEquals(False, b_3_2.has_key('e'))
- self.assertEquals(False, b_2.has_key('e'))
+ self.assertEqual(4711, c_3['e'])
+ self.assertEqual(False, 'e' in c_2)
+ self.assertEqual(False, 'e' in b_3)
+ self.assertEqual(False, 'e' in b_3_2)
+ self.assertEqual(False, 'e' in b_2)
b_3['e'] = 'viel'
- self.assertEquals('viel', b_3['e'])
- self.assertEquals(4711, c_3['e'])
- self.assertEquals(False, c_2.has_key('e'))
- self.assertEquals(True, b_3.has_key('e'))
- self.assertEquals(False, b_3_2.has_key('e'))
- self.assertEquals(False, b_2.has_key('e'))
+ self.assertEqual('viel', b_3['e'])
+ self.assertEqual(4711, c_3['e'])
+ self.assertEqual(False, 'e' in c_2)
+ self.assertEqual(True, 'e' in b_3)
+ self.assertEqual(False, 'e' in b_3_2)
+ self.assertEqual(False, 'e' in b_2)
def testCow(self):
from bb.COW import COWDictBase
@@ -115,12 +115,12 @@ class COWTestCase(unittest.TestCase):
copy = c.copy()
- self.assertEquals(1027, c['123'])
- self.assertEquals(4711, c['other'])
- self.assertEquals({'abc':10, 'bcd':20}, c['d'])
- self.assertEquals(1027, copy['123'])
- self.assertEquals(4711, copy['other'])
- self.assertEquals({'abc':10, 'bcd':20}, copy['d'])
+ self.assertEqual(1027, c['123'])
+ self.assertEqual(4711, c['other'])
+ self.assertEqual({'abc':10, 'bcd':20}, c['d'])
+ self.assertEqual(1027, copy['123'])
+ self.assertEqual(4711, copy['other'])
+ self.assertEqual({'abc':10, 'bcd':20}, copy['d'])
# cow it now
copy['123'] = 1028
@@ -128,9 +128,9 @@ class COWTestCase(unittest.TestCase):
copy['d']['abc'] = 20
- self.assertEquals(1027, c['123'])
- self.assertEquals(4711, c['other'])
- self.assertEquals({'abc':10, 'bcd':20}, c['d'])
- self.assertEquals(1028, copy['123'])
- self.assertEquals(4712, copy['other'])
- self.assertEquals({'abc':20, 'bcd':20}, copy['d'])
+ self.assertEqual(1027, c['123'])
+ self.assertEqual(4711, c['other'])
+ self.assertEqual({'abc':10, 'bcd':20}, c['d'])
+ self.assertEqual(1028, copy['123'])
+ self.assertEqual(4712, copy['other'])
+ self.assertEqual({'abc':20, 'bcd':20}, copy['d'])
next reply other threads:[~2016-05-09 13:03 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-05-09 13:03 Richard Purdie [this message]
2016-05-09 14:17 ` [PATCH] tests: assertEquals -> assertEqual Peter Kjellerstedt
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1462799021.21831.130.camel@linuxfoundation.org \
--to=richard.purdie@linuxfoundation.org \
--cc=bitbake-devel@lists.openembedded.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.