← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/tests/blackbox/test_conflicts.py

  • Committer: Martin Pool
  • Date: 2007-06-26 08:02:36 UTC
  • mto: This revision was merged to the branch mainline in revision 2555.
  • Revision ID: mbp@sourcefrog.net-20070626080236-14ihgomtffc9tezj
Cleanup old variations on run_bzr in the test suite

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/blackbox/test_conflicts.py
26
26
# the number of lines - there should be more examination.
27
27
 
28
28
class TestConflicts(ExternalBase):
 
29
 
29
30
    def setUp(self):
30
31
        super(ExternalBase, self).setUp()
31
32
        try:
33
34
        except:
34
35
            raise os.getcwd()
35
36
        os.chdir('a')
36
 
        self.runbzr('init')
 
37
        self.run_bzr('init')
37
38
        file('myfile', 'wb').write('contentsa\n')
38
39
        file('my_other_file', 'wb').write('contentsa\n')
39
40
        os.mkdir('mydir')
40
 
        self.runbzr('add')
41
 
        self.runbzr('commit -m new')
 
41
        self.run_bzr('add')
 
42
        self.run_bzr('commit -m new')
42
43
        os.chdir('..')
43
 
        self.runbzr('branch a b')
 
44
        self.run_bzr('branch a b')
44
45
        os.chdir('b')
45
46
        file('myfile', 'wb').write('contentsb\n')
46
47
        file('my_other_file', 'wb').write('contentsb\n')
47
 
        self.runbzr('mv mydir mydir2')
48
 
        self.runbzr('commit -m change')
 
48
        self.run_bzr('mv mydir mydir2')
 
49
        self.run_bzr('commit -m change')
49
50
        os.chdir('../a')
50
51
        file('myfile', 'wb').write('contentsa2\n')
51
52
        file('my_other_file', 'wb').write('contentsa2\n')
52
 
        self.runbzr('mv mydir mydir3')
53
 
        self.runbzr('commit -m change')
54
 
        self.runbzr('merge ../b', retcode=1)
 
53
        self.run_bzr('mv mydir mydir3')
 
54
        self.run_bzr('commit -m change')
 
55
        self.run_bzr('merge ../b', retcode=1)
55
56
 
56
57
    def test_conflicts(self):
57
 
        conflicts = self.runbzr('conflicts', backtick=True)
 
58
        conflicts, errs = self.run_bzr_captured(['conflicts'])
58
59
        self.assertEqual(3, len(conflicts.splitlines()))
59
60
 
60
61
    def test_conflicts_text(self):
62
63
        self.assertEqual(['my_other_file', 'myfile'], conflicts)
63
64
 
64
65
    def test_resolve(self):
65
 
        self.runbzr('resolve myfile')
66
 
        conflicts = self.runbzr('conflicts', backtick=True)
 
66
        self.run_bzr('resolve myfile')
 
67
        conflicts, errs = self.run_bzr_captured(['conflicts'])
67
68
        self.assertEqual(2, len(conflicts.splitlines()))
68
 
        self.runbzr('resolve my_other_file')
69
 
        self.runbzr('resolve mydir2')
70
 
        conflicts = self.runbzr('conflicts', backtick=True)
 
69
        self.run_bzr('resolve my_other_file')
 
70
        self.run_bzr('resolve mydir2')
 
71
        conflicts, errs = self.run_bzr_captured(['conflicts'])
71
72
        self.assertEqual(len(conflicts.splitlines()), 0)
72
73
 
73
74
    def test_resolve_all(self):
74
 
        self.runbzr('resolve --all')
75
 
        conflicts = self.runbzr('conflicts', backtick=True)
 
75
        self.run_bzr('resolve --all')
 
76
        conflicts, errs = self.run_bzr_captured(['conflicts'])
76
77
        self.assertEqual(len(conflicts.splitlines()), 0)
77
78
 
78
79
    def test_resolve_in_subdir(self):
81
82
        try:
82
83
            os.mkdir("subdir")
83
84
            os.chdir("subdir")
84
 
            self.runbzr("resolve ../myfile")
 
85
            self.run_bzr("resolve ../myfile")
85
86
            os.chdir("../../b")
86
 
            self.runbzr("resolve ../a/myfile")
 
87
            self.run_bzr("resolve ../a/myfile")
87
88
            wt = WorkingTree.open_containing('.')[0]
88
89
            conflicts = wt.conflicts()
89
90
            if not conflicts.is_empty():