tests: use assertEqual()
This avoids a deprecation warning under at least Python 3.7.
Differential Revision: https://phab.mercurial-scm.org/D5653
--- a/tests/test-remotefilelog-datapack.py Tue Jan 22 18:11:34 2019 -0800
+++ b/tests/test-remotefilelog-datapack.py Tue Jan 22 18:16:53 2019 -0800
@@ -79,11 +79,11 @@
revisions = [(filename, node, nullid, content)]
pack = self.createPack(revisions)
if self.paramsavailable:
- self.assertEquals(pack.params.fanoutprefix,
- basepack.SMALLFANOUTPREFIX)
+ self.assertEqual(pack.params.fanoutprefix,
+ basepack.SMALLFANOUTPREFIX)
chain = pack.getdeltachain(filename, node)
- self.assertEquals(content, chain[0][4])
+ self.assertEqual(content, chain[0][4])
def testAddSingle(self):
self._testAddSingle('')
@@ -106,10 +106,10 @@
for filename, node, base, content in revisions:
entry = pack.getdelta(filename, node)
- self.assertEquals((content, filename, base, {}), entry)
+ self.assertEqual((content, filename, base, {}), entry)
chain = pack.getdeltachain(filename, node)
- self.assertEquals(content, chain[0][4])
+ self.assertEqual(content, chain[0][4])
def testAddDeltas(self):
"""Test putting multiple delta blobs into a pack and read the chain.
@@ -127,13 +127,13 @@
entry = pack.getdelta(filename, revisions[0][1])
realvalue = (revisions[0][3], filename, revisions[0][2], {})
- self.assertEquals(entry, realvalue)
+ self.assertEqual(entry, realvalue)
# Test that the chain for the final entry has all the others
chain = pack.getdeltachain(filename, node)
for i in range(10):
content = "abcdef%s" % i
- self.assertEquals(content, chain[-i - 1][4])
+ self.assertEqual(content, chain[-i - 1][4])
def testPackMany(self):
"""Pack many related and unrelated objects.
@@ -162,7 +162,7 @@
chain = pack.getdeltachain(filename, node)
for entry in chain:
expectedcontent = blobs[(entry[0], entry[1], entry[3])]
- self.assertEquals(entry[4], expectedcontent)
+ self.assertEqual(entry[4], expectedcontent)
def testPackMetadata(self):
revisions = []
@@ -181,7 +181,7 @@
# flag == 0 should be optimized out
if origmeta[constants.METAKEYFLAG] == 0:
del origmeta[constants.METAKEYFLAG]
- self.assertEquals(parsedmeta, origmeta)
+ self.assertEqual(parsedmeta, origmeta)
def testGetMissing(self):
"""Test the getmissing() api.
@@ -206,7 +206,7 @@
fakenode = self.getFakeHash()
missing = pack.getmissing([("foo", revisions[0][1]), ("foo", fakenode)])
- self.assertEquals(missing, [("foo", fakenode)])
+ self.assertEqual(missing, [("foo", fakenode)])
def testAddThrows(self):
pack = self.createPack()
@@ -238,7 +238,7 @@
revisions = [("filename", fakenode, self.getFakeHash(), "content")]
pack = self.createPack(revisions)
chain = pack.getdeltachain("filename", fakenode)
- self.assertEquals(len(chain), 1)
+ self.assertEqual(len(chain), 1)
def testLargePack(self):
"""Test creating and reading from a large pack with over X entries.
@@ -255,12 +255,12 @@
pack = self.createPack(revisions)
if self.paramsavailable:
- self.assertEquals(pack.params.fanoutprefix,
- basepack.LARGEFANOUTPREFIX)
+ self.assertEqual(pack.params.fanoutprefix,
+ basepack.LARGEFANOUTPREFIX)
for (filename, node), content in blobs.iteritems():
actualcontent = pack.getdeltachain(filename, node)[0][4]
- self.assertEquals(actualcontent, content)
+ self.assertEqual(actualcontent, content)
def testPacksCache(self):
"""Test that we remember the most recent packs while fetching the delta
@@ -300,12 +300,12 @@
chain = store.getdeltachain(revision[0], revision[1])
mostrecentpack = next(iter(store.packs), None)
- self.assertEquals(
+ self.assertEqual(
mostrecentpack.getdeltachain(revision[0], revision[1]),
chain
)
- self.assertEquals(randomchain.index(revision) + 1, len(chain))
+ self.assertEqual(randomchain.index(revision) + 1, len(chain))
# perf test off by default since it's slow
def _testIndexPerf(self):
--- a/tests/test-remotefilelog-histpack.py Tue Jan 22 18:11:34 2019 -0800
+++ b/tests/test-remotefilelog-histpack.py Tue Jan 22 18:16:53 2019 -0800
@@ -78,9 +78,9 @@
pack = self.createPack(revisions)
actual = pack.getancestors(filename, node)[node]
- self.assertEquals(p1, actual[0])
- self.assertEquals(p2, actual[1])
- self.assertEquals(linknode, actual[2])
+ self.assertEqual(p1, actual[0])
+ self.assertEqual(p2, actual[1])
+ self.assertEqual(linknode, actual[2])
def testAddMultiple(self):
"""Test putting multiple unrelated revisions into a pack and reading
@@ -99,10 +99,10 @@
for filename, node, p1, p2, linknode, copyfrom in revisions:
actual = pack.getancestors(filename, node)[node]
- self.assertEquals(p1, actual[0])
- self.assertEquals(p2, actual[1])
- self.assertEquals(linknode, actual[2])
- self.assertEquals(copyfrom, actual[3])
+ self.assertEqual(p1, actual[0])
+ self.assertEqual(p2, actual[1])
+ self.assertEqual(linknode, actual[2])
+ self.assertEqual(copyfrom, actual[3])
def testAddAncestorChain(self):
"""Test putting multiple revisions in into a pack and read the ancestor
@@ -124,10 +124,10 @@
ancestors = pack.getancestors(revisions[0][0], revisions[0][1])
for filename, node, p1, p2, linknode, copyfrom in revisions:
ap1, ap2, alinknode, acopyfrom = ancestors[node]
- self.assertEquals(ap1, p1)
- self.assertEquals(ap2, p2)
- self.assertEquals(alinknode, linknode)
- self.assertEquals(acopyfrom, copyfrom)
+ self.assertEqual(ap1, p1)
+ self.assertEqual(ap2, p2)
+ self.assertEqual(alinknode, linknode)
+ self.assertEqual(acopyfrom, copyfrom)
def testPackMany(self):
"""Pack many related and unrelated ancestors.
@@ -163,14 +163,14 @@
# Verify the pack contents
for (filename, node), (p1, p2, lastnode) in allentries.items():
ancestors = pack.getancestors(filename, node)
- self.assertEquals(ancestorcounts[(filename, node)],
- len(ancestors))
+ self.assertEqual(ancestorcounts[(filename, node)],
+ len(ancestors))
for anode, (ap1, ap2, alinknode, copyfrom) in ancestors.items():
ep1, ep2, elinknode = allentries[(filename, anode)]
- self.assertEquals(ap1, ep1)
- self.assertEquals(ap2, ep2)
- self.assertEquals(alinknode, elinknode)
- self.assertEquals(copyfrom, None)
+ self.assertEqual(ap1, ep1)
+ self.assertEqual(ap2, ep2)
+ self.assertEqual(alinknode, elinknode)
+ self.assertEqual(copyfrom, None)
def testGetNodeInfo(self):
revisions = []
@@ -186,10 +186,10 @@
# Test that getnodeinfo returns the expected results
for filename, node, p1, p2, linknode, copyfrom in revisions:
ap1, ap2, alinknode, acopyfrom = pack.getnodeinfo(filename, node)
- self.assertEquals(ap1, p1)
- self.assertEquals(ap2, p2)
- self.assertEquals(alinknode, linknode)
- self.assertEquals(acopyfrom, copyfrom)
+ self.assertEqual(ap1, p1)
+ self.assertEqual(ap2, p2)
+ self.assertEqual(alinknode, linknode)
+ self.assertEqual(acopyfrom, copyfrom)
def testGetMissing(self):
"""Test the getmissing() api.
@@ -215,11 +215,11 @@
fakenode = self.getFakeHash()
missing = pack.getmissing([(filename, revisions[0][1]),
(filename, fakenode)])
- self.assertEquals(missing, [(filename, fakenode)])
+ self.assertEqual(missing, [(filename, fakenode)])
# Test getmissing on a non-existant filename
missing = pack.getmissing([("bar", fakenode)])
- self.assertEquals(missing, [("bar", fakenode)])
+ self.assertEqual(missing, [("bar", fakenode)])
def testAddThrows(self):
pack = self.createPack()
@@ -260,14 +260,14 @@
revisions.append((filename, node, p1, p2, linknode, None))
pack = self.createPack(revisions)
- self.assertEquals(pack.params.fanoutprefix, basepack.LARGEFANOUTPREFIX)
+ self.assertEqual(pack.params.fanoutprefix, basepack.LARGEFANOUTPREFIX)
for filename, node, p1, p2, linknode, copyfrom in revisions:
actual = pack.getancestors(filename, node)[node]
- self.assertEquals(p1, actual[0])
- self.assertEquals(p2, actual[1])
- self.assertEquals(linknode, actual[2])
- self.assertEquals(copyfrom, actual[3])
+ self.assertEqual(p1, actual[0])
+ self.assertEqual(p2, actual[1])
+ self.assertEqual(linknode, actual[2])
+ self.assertEqual(copyfrom, actual[3])
# TODO:
# histpack store:
# - repack two packs into one