← 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: John Arbash Meinel
  • Date: 2007-07-13 02:23:34 UTC
  • mfrom: (2592 +trunk) (2612 +trunk)
  • mto: This revision was merged to the branch mainline in revision 2614.
  • Revision ID: john@arbash-meinel.com-20070713022334-qb6ewgo6v4251yd9
[merge] bzr.dev 2612

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/blackbox/test_conflicts.py
55
55
        self.run_bzr('merge ../b', retcode=1)
56
56
 
57
57
    def test_conflicts(self):
58
 
        conflicts, errs = self.run_bzr(['conflicts'])
 
58
        conflicts, errs = self.run_bzr('conflicts')
59
59
        self.assertEqual(3, len(conflicts.splitlines()))
60
60
 
61
61
    def test_conflicts_text(self):
62
 
        conflicts = self.run_bzr('conflicts', '--text')[0].splitlines()
 
62
        conflicts = self.run_bzr('conflicts --text')[0].splitlines()
63
63
        self.assertEqual(['my_other_file', 'myfile'], conflicts)
64
64
 
65
65
    def test_resolve(self):
66
66
        self.run_bzr('resolve myfile')
67
 
        conflicts, errs = self.run_bzr(['conflicts'])
 
67
        conflicts, errs = self.run_bzr('conflicts')
68
68
        self.assertEqual(2, len(conflicts.splitlines()))
69
69
        self.run_bzr('resolve my_other_file')
70
70
        self.run_bzr('resolve mydir2')
71
 
        conflicts, errs = self.run_bzr(['conflicts'])
 
71
        conflicts, errs = self.run_bzr('conflicts')
72
72
        self.assertEqual(len(conflicts.splitlines()), 0)
73
73
 
74
74
    def test_resolve_all(self):
75
75
        self.run_bzr('resolve --all')
76
 
        conflicts, errs = self.run_bzr(['conflicts'])
 
76
        conflicts, errs = self.run_bzr('conflicts')
77
77
        self.assertEqual(len(conflicts.splitlines()), 0)
78
78
 
79
79
    def test_resolve_in_subdir(self):