--- a/tests/test-status.py	Sun Mar 08 13:08:37 2015 -0400
+++ b/tests/test-status.py	Mon Mar 09 18:26:25 2015 -0400
@@ -1,4 +1,5 @@
 import common, os
+from hglib.util import b
 
 class test_status(common.basetest):
     def test_empty(self):
@@ -11,22 +12,22 @@
         self.append('modified', 'a')
         self.append('removed', 'a')
         self.append('missing', 'a')
-        self.client.commit('first', addremove=True)
+        self.client.commit(b('first'), addremove=True)
         self.append('modified', 'a')
         self.append('added', 'a')
-        self.client.add(['added'])
+        self.client.add([b('added')])
         os.remove('missing')
-        self.client.remove(['removed'])
+        self.client.remove([b('removed')])
         self.append('untracked')
 
-        l = [('M', 'modified'),
-             ('A', 'added'),
-             ('R', 'removed'),
-             ('C', '.hgignore'),
-             ('C', 'clean'),
-             ('!', 'missing'),
-             ('?', 'untracked'),
-             ('I', 'ignored')]
+        l = [(b('M'), b('modified')),
+             (b('A'), b('added')),
+             (b('R'), b('removed')),
+             (b('C'), b('.hgignore')),
+             (b('C'), b('clean')),
+             (b('!'), b('missing')),
+             (b('?'), b('untracked')),
+             (b('I'), b('ignored'))]
 
         st = self.client.status(all=True)
 
@@ -35,14 +36,14 @@
 
     def test_copy(self):
         self.append('source', 'a')
-        self.client.commit('first', addremove=True)
-        self.client.copy('source', 'dest')
-        l = [('A', 'dest'), (' ', 'source')]
+        self.client.commit(b('first'), addremove=True)
+        self.client.copy(b('source'), b('dest'))
+        l = [(b('A'), b('dest')), (b(' '), b('source'))]
         self.assertEquals(self.client.status(copies=True), l)
 
     def test_copy_origin_space(self):
         self.append('s ource', 'a')
-        self.client.commit('first', addremove=True)
-        self.client.copy('s ource', 'dest')
-        l = [('A', 'dest'), (' ', 's ource')]
+        self.client.commit(b('first'), addremove=True)
+        self.client.copy(b('s ource'), b('dest'))
+        l = [(b('A'), b('dest')), (b(' '), b('s ource'))]
         self.assertEquals(self.client.status(copies=True), l)