tests/test-annotate.py
changeset 35947 a36d3c8a0e41
parent 35946 cf887d601014
child 36917 7affcabf561e
--- a/tests/test-annotate.py	Wed Feb 07 13:21:06 2018 +0530
+++ b/tests/test-annotate.py	Wed Feb 07 13:34:51 2018 +0530
@@ -36,17 +36,17 @@
         p1ann = decorate(p1data, p1fctx)
         p1ann = _annotatepair([oldann], p1fctx, p1ann, False, diffopts)
         self.assertEqual(p1ann[0], [
-            annotateline('old', 1),
-            annotateline('old', 2),
-            annotateline('p1', 3),
+            annotateline(b'old', 1),
+            annotateline(b'old', 2),
+            annotateline(b'p1', 3),
         ])
 
         p2ann = decorate(p2data, p2fctx)
         p2ann = _annotatepair([oldann], p2fctx, p2ann, False, diffopts)
         self.assertEqual(p2ann[0], [
-            annotateline('old', 1),
-            annotateline('p2', 2),
-            annotateline('p2', 3),
+            annotateline(b'old', 1),
+            annotateline(b'p2', 2),
+            annotateline(b'p2', 3),
         ])
 
         # Test with multiple parents (note the difference caused by ordering)
@@ -55,22 +55,22 @@
         childann = _annotatepair([p1ann, p2ann], childfctx, childann, False,
                                  diffopts)
         self.assertEqual(childann[0], [
-            annotateline('old', 1),
-            annotateline('c', 2),
-            annotateline('p2', 2),
-            annotateline('c', 4),
-            annotateline('p2', 3),
+            annotateline(b'old', 1),
+            annotateline(b'c', 2),
+            annotateline(b'p2', 2),
+            annotateline(b'c', 4),
+            annotateline(b'p2', 3),
         ])
 
         childann = decorate(childdata, childfctx)
         childann = _annotatepair([p2ann, p1ann], childfctx, childann, False,
                                  diffopts)
         self.assertEqual(childann[0], [
-            annotateline('old', 1),
-            annotateline('c', 2),
-            annotateline('p1', 3),
-            annotateline('c', 4),
-            annotateline('p2', 3),
+            annotateline(b'old', 1),
+            annotateline(b'c', 2),
+            annotateline(b'p1', 3),
+            annotateline(b'c', 4),
+            annotateline(b'p2', 3),
         ])
 
         # Test with skipchild (note the difference caused by ordering)
@@ -79,24 +79,24 @@
         childann = _annotatepair([p1ann, p2ann], childfctx, childann, True,
                                  diffopts)
         self.assertEqual(childann[0], [
-            annotateline('old', 1),
-            annotateline('old', 2, True),
+            annotateline(b'old', 1),
+            annotateline(b'old', 2, True),
             # note that this line was carried over from earlier so it is *not*
             # marked skipped
-            annotateline('p2', 2),
-            annotateline('p2', 2, True),
-            annotateline('p2', 3),
+            annotateline(b'p2', 2),
+            annotateline(b'p2', 2, True),
+            annotateline(b'p2', 3),
         ])
 
         childann = decorate(childdata, childfctx)
         childann = _annotatepair([p2ann, p1ann], childfctx, childann, True,
                                  diffopts)
         self.assertEqual(childann[0], [
-            annotateline('old', 1),
-            annotateline('old', 2, True),
-            annotateline('p1', 3),
-            annotateline('p1', 3, True),
-            annotateline('p2', 3),
+            annotateline(b'old', 1),
+            annotateline(b'old', 2, True),
+            annotateline(b'p1', 3),
+            annotateline(b'p1', 3, True),
+            annotateline(b'p2', 3),
         ])
 
 if __name__ == '__main__':