~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

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

  • Committer: Aaron Bentley
  • Date: 2007-07-25 19:32:22 UTC
  • mto: (1551.19.24 Aaron's mergeable stuff)
  • mto: This revision was merged to the branch mainline in revision 2664.
  • Revision ID: abentley@panoramicfeedback.com-20070725193222-lcq4z4980ffd4bf5
Stop using _merge_helper for merging

Show diffs side-by-side

added added

removed removed

Lines of Context:
30
30
        """Test that 'added' command reports added files"""
31
31
 
32
32
        def check_added(expected):
33
 
            out, err = self.run_bzr_captured(['added'])
 
33
            out, err = self.run_bzr('added')
34
34
            self.assertEquals(out, expected)
35
35
            self.assertEquals(err, '')
36
36
 
48
48
        # after add, shows up in list
49
49
        # bug report 20060119 by Nathan McCallum -- 'bzr added' causes
50
50
        # NameError
51
 
        bzr('add', 'a')
 
51
        bzr('add a')
52
52
        check_added('a\n')
53
53
 
54
54
        # after commit, now no longer listed
55
 
        bzr('commit', '-m', 'add a')
 
55
        bzr(['commit', '-m', 'add a'])
56
56
        check_added('')