← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

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

  • Committer: Lukáš Lalinsky
  • Date: 2007-08-27 14:55:48 UTC
  • mto: (2761.1.1 tree-conflicts)
  • mto: This revision was merged to the branch mainline in revision 2762.
  • Revision ID: lalinsky@gmail.com-20070827145548-s89tzqovpyvqdp61
Return ConflictsList() instead of [] from Tree.conflicts.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/blackbox/test_status.py
230
230
        tof.seek(0)
231
231
        self.assertEquals(tof.readlines(), ['?   dir2/\n'])
232
232
 
 
233
        tof = StringIO()
 
234
        revs = [RevisionSpec.from_string('0'), RevisionSpec.from_string('1')]
 
235
        show_tree_status(wt, specific_files=['test.c'], to_file=tof, short=True,
 
236
                         revision=revs)
 
237
        tof.seek(0)
 
238
        self.assertEquals(tof.readlines(), ['+N  test.c\n'])
 
239
 
 
240
 
233
241
    def test_specific_files_conflicts(self):
234
242
        tree = self.make_branch_and_tree('.')
235
243
        self.build_tree(['dir2/'])