comparison 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
comparison
equal deleted inserted replaced
142:fe74d5599539 143:4359cabcb0cc
1 import common 1 import common
2 import hglib 2 import hglib
3 from hglib.util import b
3 4
4 class test_branch(common.basetest): 5 class test_branch(common.basetest):
5 def test_empty(self): 6 def test_empty(self):
6 self.assertEquals(self.client.branch(), 'default') 7 self.assertEquals(self.client.branch(), b('default'))
7 8
8 def test_basic(self): 9 def test_basic(self):
9 self.assertEquals(self.client.branch('foo'), 'foo') 10 self.assertEquals(self.client.branch(b('foo')), b('foo'))
10 self.append('a', 'a') 11 self.append('a', 'a')
11 rev, node = self.client.commit('first', addremove=True) 12 rev, node = self.client.commit(b('first'), addremove=True)
12 13
13 rev = self.client.log(node)[0] 14 rev = self.client.log(node)[0]
14 15
15 self.assertEquals(rev.branch, 'foo') 16 self.assertEquals(rev.branch, b('foo'))
16 self.assertEquals(self.client.branches(), 17 self.assertEquals(self.client.branches(),
17 [(rev.branch, int(rev.rev), rev.node[:12])]) 18 [(rev.branch, int(rev.rev), rev.node[:12])])
18 19
19 def test_reset_with_name(self): 20 def test_reset_with_name(self):
20 self.assertRaises(ValueError, self.client.branch, 'foo', clean=True) 21 self.assertRaises(ValueError, self.client.branch, b('foo'), clean=True)
21 22
22 def test_reset(self): 23 def test_reset(self):
23 self.client.branch('foo') 24 self.client.branch(b('foo'))
24 self.assertEquals(self.client.branch(clean=True), 'default') 25 self.assertEquals(self.client.branch(clean=True), b('default'))
25 26
26 def test_exists(self): 27 def test_exists(self):
27 self.append('a', 'a') 28 self.append('a', 'a')
28 self.client.commit('first', addremove=True) 29 self.client.commit(b('first'), addremove=True)
29 self.client.branch('foo') 30 self.client.branch(b('foo'))
30 self.append('a', 'a') 31 self.append('a', 'a')
31 self.client.commit('second') 32 self.client.commit(b('second'))
32 self.assertRaises(hglib.error.CommandError, 33 self.assertRaises(hglib.error.CommandError,
33 self.client.branch, 'default') 34 self.client.branch, b('default'))
34 35
35 def test_force(self): 36 def test_force(self):
36 self.append('a', 'a') 37 self.append('a', 'a')
37 self.client.commit('first', addremove=True) 38 self.client.commit(b('first'), addremove=True)
38 self.client.branch('foo') 39 self.client.branch(b('foo'))
39 self.append('a', 'a') 40 self.append('a', 'a')
40 self.client.commit('second') 41 self.client.commit(b('second'))
41 42
42 self.assertRaises(hglib.error.CommandError, 43 self.assertRaises(hglib.error.CommandError,
43 self.client.branch, 'default') 44 self.client.branch, b('default'))
44 self.assertEquals(self.client.branch('default', force=True), 'default') 45 self.assertEquals(self.client.branch(b('default'), force=True),
46 b('default'))