diff tests/test-annotate.py @ 143:4359cabcb0cc

hglib: move string literals in the test code to util.b() (issue4520)
author Brett Cannon <brett@python.org>
date Mon, 09 Mar 2015 18:26:25 -0400
parents 1b47146a4a2c
children c1b966866ed7
line wrap: on
line diff
--- a/tests/test-annotate.py	Sun Mar 08 13:08:37 2015 -0400
+++ b/tests/test-annotate.py	Mon Mar 09 18:26:25 2015 -0400
@@ -1,30 +1,32 @@
 import common
+from hglib.util import b
 
 class test_annotate(common.basetest):
     def test_basic(self):
         self.append('a', 'a\n')
-        rev, node0 = self.client.commit('first', addremove=True)
+        rev, node0 = self.client.commit(b('first'), addremove=True)
         self.append('a', 'a\n')
-        rev, node1 = self.client.commit('second')
+        rev, node1 = self.client.commit(b('second'))
 
-        self.assertEquals(list(self.client.annotate('a')), [('0',
-                                                             'a'), ('1', 'a')])
+        self.assertEquals(list(self.client.annotate(b('a'))),
+                          [(b('0'), b('a')), (b('1'), b('a'))])
         self.assertEquals(list(
             self.client.annotate(
-                'a', user=True, file=True,
+                b('a'), user=True, file=True,
                 number=True, changeset=True, line=True, verbose=True)),
-                          [('test 0 %s a:1' % node0[:12], 'a'),
-                           ('test 1 %s a:2' % node1[:12], 'a')])
+                          [(b('test 0 ') + node0[:12] + b(' a:1'), b('a')),
+                           (b('test 1 ') + node1[:12] + b(' a:2'), b('a'))])
 
     def test_files(self):
         self.append('a', 'a\n')
-        rev, node0 = self.client.commit('first', addremove=True)
+        rev, node0 = self.client.commit(b('first'), addremove=True)
         self.append('b', 'b\n')
-        rev, node1 = self.client.commit('second', addremove=True)
-        self.assertEquals(list(self.client.annotate(['a', 'b'])),
-                          [('0', 'a'), ('1', 'b')])
+        rev, node1 = self.client.commit(b('second'), addremove=True)
+        self.assertEquals(list(self.client.annotate([b('a'), b('b')])),
+                          [(b('0'), b('a')), (b('1'), b('b'))])
 
     def test_two_colons(self):
         self.append('a', 'a: b\n')
-        self.client.commit('first', addremove=True)
-        self.assertEquals(list(self.client.annotate('a')), [('0', 'a: b')])
+        self.client.commit(b('first'), addremove=True)
+        self.assertEquals(list(self.client.annotate(b('a'))),
+                          [(b('0'), b('a: b'))])