← 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: Alexander Belchenko
  • Date: 2010-06-17 08:53:15 UTC
  • mfrom: (5300 +trunk)
  • mto: (5303.2.1 integration)
  • mto: This revision was merged to the branch mainline in revision 5305.
  • Revision ID: bialix@ukr.net-20100617085315-hr8186zck57zn35s
merge bzr.dev; fix NEWS

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/blackbox/test_conflicts.py
70
70
        out, err = self.run_bzr('conflicts --text')
71
71
        self.assertEqual(['my_other_file', 'myfile'], out.splitlines())
72
72
 
 
73
    def test_conflicts_directory(self):
 
74
        """Test --directory option"""
 
75
        out, err = self.run_bzr('conflicts --directory a', working_dir='.')
 
76
        self.assertEqual(3, len(out.splitlines()))
 
77
        self.assertEqual('', err)
 
78
 
73
79
 
74
80
class TestResolve(TestConflictsBase):
75
81
 
113
119
        self.build_tree_contents([('tree/file', 'a\n')])
114
120
        note = self.run_bzr('resolve', working_dir='tree')[1]
115
121
        self.assertContainsRe(note, 'All conflicts resolved.')
 
122
 
 
123
    def test_resolve_all_directory(self):
 
124
        """Test --directory option"""
 
125
        out, err = self.run_bzr('resolve --all -d a', working_dir='.')
 
126
        self.assertEqual('', err)
 
127
        out, err = self.run_bzr('conflicts')
 
128
        self.assertEqual(0, len(out.splitlines()))