diff tests/test-branch.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-branch.py	Sun Mar 08 13:08:37 2015 -0400
+++ b/tests/test-branch.py	Mon Mar 09 18:26:25 2015 -0400
@@ -1,44 +1,46 @@
 import common
 import hglib
+from hglib.util import b
 
 class test_branch(common.basetest):
     def test_empty(self):
-        self.assertEquals(self.client.branch(), 'default')
+        self.assertEquals(self.client.branch(), b('default'))
 
     def test_basic(self):
-        self.assertEquals(self.client.branch('foo'), 'foo')
+        self.assertEquals(self.client.branch(b('foo')), b('foo'))
         self.append('a', 'a')
-        rev, node = self.client.commit('first', addremove=True)
+        rev, node = self.client.commit(b('first'), addremove=True)
 
         rev = self.client.log(node)[0]
 
-        self.assertEquals(rev.branch, 'foo')
+        self.assertEquals(rev.branch, b('foo'))
         self.assertEquals(self.client.branches(),
                           [(rev.branch, int(rev.rev), rev.node[:12])])
 
     def test_reset_with_name(self):
-        self.assertRaises(ValueError, self.client.branch, 'foo', clean=True)
+        self.assertRaises(ValueError, self.client.branch, b('foo'), clean=True)
 
     def test_reset(self):
-        self.client.branch('foo')
-        self.assertEquals(self.client.branch(clean=True), 'default')
+        self.client.branch(b('foo'))
+        self.assertEquals(self.client.branch(clean=True), b('default'))
 
     def test_exists(self):
         self.append('a', 'a')
-        self.client.commit('first', addremove=True)
-        self.client.branch('foo')
+        self.client.commit(b('first'), addremove=True)
+        self.client.branch(b('foo'))
         self.append('a', 'a')
-        self.client.commit('second')
+        self.client.commit(b('second'))
         self.assertRaises(hglib.error.CommandError,
-                          self.client.branch, 'default')
+                          self.client.branch, b('default'))
 
     def test_force(self):
         self.append('a', 'a')
-        self.client.commit('first', addremove=True)
-        self.client.branch('foo')
+        self.client.commit(b('first'), addremove=True)
+        self.client.branch(b('foo'))
         self.append('a', 'a')
-        self.client.commit('second')
+        self.client.commit(b('second'))
 
         self.assertRaises(hglib.error.CommandError,
-                          self.client.branch, 'default')
-        self.assertEquals(self.client.branch('default', force=True), 'default')
+                          self.client.branch, b('default'))
+        self.assertEquals(self.client.branch(b('default'), force=True),
+                          b('default'))