← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

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

  • Committer: Andrew Bennetts
  • Date: 2008-05-21 11:58:09 UTC
  • mto: (3452.2.9 inter-remote-pack)
  • mto: This revision was merged to the branch mainline in revision 3511.
  • Revision ID: andrew.bennetts@canonical.com-20080521115809-6cw3t8gn4qm0bpg9
Remove a bit more debugging cruft.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/blackbox/test_added.py
1
 
# Copyright (C) 2006 by Canonical Ltd
 
1
# Copyright (C) 2006 Canonical Ltd
2
2
# -*- coding: utf-8 -*-
3
 
 
 
3
#
4
4
# This program is free software; you can redistribute it and/or modify
5
5
# it under the terms of the GNU General Public License as published by
6
6
# the Free Software Foundation; either version 2 of the License, or
7
7
# (at your option) any later version.
8
 
 
 
8
#
9
9
# This program is distributed in the hope that it will be useful,
10
10
# but WITHOUT ANY WARRANTY; without even the implied warranty of
11
11
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
12
12
# GNU General Public License for more details.
13
 
 
 
13
#
14
14
# You should have received a copy of the GNU General Public License
15
15
# along with this program; if not, write to the Free Software
16
16
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
21
21
import os
22
22
 
23
23
from bzrlib.branch import Branch
24
 
from bzrlib.tests import TestCaseInTempDir
25
 
from bzrlib.tests.treeshape import build_tree_contents
 
24
from bzrlib.tests.blackbox import ExternalBase
26
25
 
27
 
class TestAdded(TestCaseInTempDir):
 
26
class TestAdded(ExternalBase):
28
27
 
29
28
    def test_added(self):
30
29
        """Test that 'added' command reports added files"""
31
30
 
32
31
        def check_added(expected):
33
 
            out, err = self.run_bzr_captured(['added'])
 
32
            out, err = self.run_bzr('added')
34
33
            self.assertEquals(out, expected)
35
34
            self.assertEquals(err, '')
36
35
 
37
 
        def bzr(*args):
38
 
            self.run_bzr(*args)
39
 
 
40
36
        # in empty directory, nothing added
41
 
        bzr('init')
 
37
        tree = self.make_branch_and_tree('.')
42
38
        check_added('')
43
39
 
44
40
        # with unknown file, still nothing added
45
 
        build_tree_contents([('a', 'contents of a\n')])
 
41
        self.build_tree_contents([('a', 'contents of a\n')])
46
42
        check_added('')
47
43
 
48
44
        # after add, shows up in list
49
45
        # bug report 20060119 by Nathan McCallum -- 'bzr added' causes
50
46
        # NameError
51
 
        bzr('add', 'a')
 
47
        tree.add('a')
52
48
        check_added('a\n')
53
49
 
54
50
        # after commit, now no longer listed
55
 
        bzr('commit', '-m', 'add a')
 
51
        tree.commit(message='add a')
56
52
        check_added('')