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

hglib: move string literals in the test code to util.b() (issue4520)

--- a/tests/test-merge.py	Sun Mar 08 13:08:37 2015 -0400
+++ b/tests/test-merge.py	Mon Mar 09 18:26:25 2015 -0400
@@ -1,22 +1,23 @@
 import common, hglib
+from hglib.util import b
 
 class test_merge(common.basetest):
     def setUp(self):
         common.basetest.setUp(self)
 
         self.append('a', 'a')
-        rev, self.node0 = self.client.commit('first', addremove=True)
+        rev, self.node0 = self.client.commit(b('first'), addremove=True)
 
         self.append('a', 'a')
-        rev, self.node1 = self.client.commit('change')
+        rev, self.node1 = self.client.commit(b('change'))
 
     def test_basic(self):
         self.client.update(self.node0)
         self.append('b', 'a')
-        rev, node2 = self.client.commit('new file', addremove=True)
+        rev, node2 = self.client.commit(b('new file'), addremove=True)
         self.client.merge(self.node1)
-        rev, node = self.client.commit('merge')
-        diff = """diff -r %s -r %s a
+        rev, node = self.client.commit(b('merge'))
+        diff = b("diff -r ") + node2[:12] + b(" -r ") + node[:12] + b(""" a
 --- a/a
 +++ b/a
 @@ -1,1 +1,1 @@
@@ -24,48 +25,48 @@
 \ No newline at end of file
 +aa
 \ No newline at end of file
-""" % (node2[:12], node[:12])
+""")
 
         self.assertEquals(diff, self.client.diff(change=node, nodates=True))
 
     def test_merge_prompt_abort(self):
         self.client.update(self.node0)
-        self.client.remove('a')
-        self.client.commit('remove')
+        self.client.remove(b('a'))
+        self.client.commit(b('remove'))
 
         self.assertRaises(hglib.error.CommandError, self.client.merge)
 
     def test_merge_prompt_noninteractive(self):
         self.client.update(self.node0)
-        self.client.remove('a')
-        rev, node = self.client.commit('remove')
+        self.client.remove(b('a'))
+        rev, node = self.client.commit(b('remove'))
 
         self.client.merge(cb=hglib.merge.handlers.noninteractive)
 
-        diff = """diff -r %s a
+        diff = b("diff -r ") + node[:12] + b(""" a
 --- /dev/null
 +++ b/a
 @@ -0,0 +1,1 @@
 +aa
 \ No newline at end of file
-""" % node[:12]
+""")
         self.assertEquals(diff, self.client.diff(nodates=True))
 
     def test_merge_prompt_cb(self):
         self.client.update(self.node0)
-        self.client.remove('a')
-        rev, node = self.client.commit('remove')
+        self.client.remove(b('a'))
+        rev, node = self.client.commit(b('remove'))
 
         def cb(output):
-            return 'c'
+            return b('c')
 
         self.client.merge(cb=cb)
 
-        diff = """diff -r %s a
+        diff = b("diff -r ") + node[:12] + b(""" a
 --- /dev/null
 +++ b/a
 @@ -0,0 +1,1 @@
 +aa
 \ No newline at end of file
-""" % node[:12]
+""")
         self.assertEquals(diff, self.client.diff(nodates=True))