tests: fix syntax error on octal literals for Py 3
This commit is contained in:
parent
60f50d9f08
commit
500a148398
@ -57,27 +57,27 @@ class TreeTest(utils.BareRepoTestCase):
|
||||
self.assertRaisesWithArg(IndexError, 3, lambda: tree[3])
|
||||
|
||||
self.assertEqual(3, len(tree))
|
||||
a_sha = '7f129fd57e31e935c6d60a0c794efe4e6927664b'
|
||||
sha = '7f129fd57e31e935c6d60a0c794efe4e6927664b'
|
||||
self.assertTrue('a' in tree)
|
||||
self.assertTreeEntryEqual(tree[0], a_sha, 'a', 0100644)
|
||||
self.assertTreeEntryEqual(tree[-3], a_sha, 'a', 0100644)
|
||||
self.assertTreeEntryEqual(tree['a'], a_sha, 'a', 0100644)
|
||||
self.assertTreeEntryEqual(tree[0], sha, 'a', 0o0100644)
|
||||
self.assertTreeEntryEqual(tree[-3], sha, 'a', 0o0100644)
|
||||
self.assertTreeEntryEqual(tree['a'], sha, 'a', 0o0100644)
|
||||
|
||||
b_sha = '85f120ee4dac60d0719fd51731e4199aa5a37df6'
|
||||
sha = '85f120ee4dac60d0719fd51731e4199aa5a37df6'
|
||||
self.assertTrue('b' in tree)
|
||||
self.assertTreeEntryEqual(tree[1], b_sha, 'b', 0100644)
|
||||
self.assertTreeEntryEqual(tree[-2], b_sha, 'b', 0100644)
|
||||
self.assertTreeEntryEqual(tree['b'], b_sha, 'b', 0100644)
|
||||
self.assertTreeEntryEqual(tree[1], sha, 'b', 0o0100644)
|
||||
self.assertTreeEntryEqual(tree[-2], sha, 'b', 0o0100644)
|
||||
self.assertTreeEntryEqual(tree['b'], sha, 'b', 0o0100644)
|
||||
|
||||
def test_read_subtree(self):
|
||||
tree = self.repo[TREE_SHA]
|
||||
subtree_entry = tree['c']
|
||||
self.assertTreeEntryEqual(subtree_entry, SUBTREE_SHA, 'c', 0040000)
|
||||
self.assertTreeEntryEqual(subtree_entry, SUBTREE_SHA, 'c', 0o0040000)
|
||||
|
||||
subtree = subtree_entry.to_object()
|
||||
self.assertEqual(1, len(subtree))
|
||||
self.assertTreeEntryEqual(
|
||||
subtree[0], '297efb891a47de80be0cfe9c639e4b8c9b450989', 'd', 0100644)
|
||||
sha = '297efb891a47de80be0cfe9c639e4b8c9b450989'
|
||||
self.assertTreeEntryEqual(subtree[0], sha, 'd', 0o0100644)
|
||||
|
||||
# XXX Creating new trees was removed from libgit2 by v0.11.0, we
|
||||
# deactivate this test temporarily, since the feature may come back in
|
||||
@ -85,15 +85,15 @@ class TreeTest(utils.BareRepoTestCase):
|
||||
def xtest_new_tree(self):
|
||||
tree = pygit2.Tree(self.repo)
|
||||
self.assertEqual(0, len(tree))
|
||||
tree.add_entry('1' * 40, 'x', 0100644)
|
||||
tree.add_entry('2' * 40, 'y', 0100755)
|
||||
tree.add_entry('1' * 40, 'x', 0o0100644)
|
||||
tree.add_entry('2' * 40, 'y', 0o0100755)
|
||||
self.assertEqual(2, len(tree))
|
||||
self.assertTrue('x' in tree)
|
||||
self.assertTrue('y' in tree)
|
||||
self.assertRaisesWithArg(KeyError, '1' * 40, tree['x'].to_object)
|
||||
|
||||
tree.add_entry('3' * 40, 'z1', 0100644)
|
||||
tree.add_entry('4' * 40, 'z2', 0100644)
|
||||
tree.add_entry('3' * 40, 'z1', 0o0100644)
|
||||
tree.add_entry('4' * 40, 'z2', 0o0100644)
|
||||
self.assertEqual(4, len(tree))
|
||||
del tree['z1']
|
||||
del tree[2]
|
||||
@ -122,4 +122,4 @@ class TreeTest(utils.BareRepoTestCase):
|
||||
|
||||
|
||||
if __name__ == '__main__':
|
||||
unittest.main()
|
||||
unittest.main()
|
||||
|
Loading…
x
Reference in New Issue
Block a user