← 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: 2007-03-26 06:24:01 UTC
  • mto: This revision was merged to the branch mainline in revision 2376.
  • Revision ID: andrew.bennetts@canonical.com-20070326062401-k3nbefzje5332jaf
Deal with review comments from Robert:

  * Add my name to the NEWS file
  * Move the test case to a new module in branch_implementations
  * Remove revision_history cruft from identitymap and test_identitymap
  * Improve some docstrings

Also, this fixes a bug where revision_history was not returning a copy of the
cached data, allowing the cache to be corrupted.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/blackbox/test_added.py
21
21
import os
22
22
 
23
23
from bzrlib.branch import Branch
24
 
from bzrlib.tests.blackbox import ExternalBase
25
 
 
26
 
 
27
 
class TestAdded(ExternalBase):
 
24
from bzrlib.tests import TestCaseInTempDir
 
25
from bzrlib.tests.treeshape import build_tree_contents
 
26
 
 
27
class TestAdded(TestCaseInTempDir):
28
28
 
29
29
    def test_added(self):
30
30
        """Test that 'added' command reports added files"""
31
 
        self._test_added('a', 'a\n')
32
 
 
33
 
    def test_added_with_spaces(self):
34
 
        """Test that 'added' command reports added files with spaces in their names quoted"""
35
 
        self._test_added('a filename with spaces', '"a filename with spaces"\n')
36
 
    
37
 
    def test_added_null_separator(self):
38
 
        """Test that added uses its null operator properly"""
39
 
        self._test_added('a', 'a\0', null=True)
40
 
 
41
 
    def _test_added(self, name, output, null=False):
42
 
 
43
 
        def check_added(expected, null=False):
44
 
            command = 'added'
45
 
 
46
 
            if null:
47
 
                command += ' --null'
48
 
 
49
 
            out, err = self.run_bzr(command)
 
31
 
 
32
        def check_added(expected):
 
33
            out, err = self.run_bzr_captured(['added'])
50
34
            self.assertEquals(out, expected)
51
35
            self.assertEquals(err, '')
52
36
 
 
37
        def bzr(*args):
 
38
            self.run_bzr(*args)
 
39
 
53
40
        # in empty directory, nothing added
54
 
        tree = self.make_branch_and_tree('.')
 
41
        bzr('init')
55
42
        check_added('')
56
43
 
57
44
        # with unknown file, still nothing added
58
 
        self.build_tree_contents([(name, 'contents of %s\n' % (name))])
 
45
        build_tree_contents([('a', 'contents of a\n')])
59
46
        check_added('')
60
 
        
 
47
 
61
48
        # after add, shows up in list
62
49
        # bug report 20060119 by Nathan McCallum -- 'bzr added' causes
63
50
        # NameError
64
 
        tree.add(name)
65
 
        check_added(output, null) 
 
51
        bzr('add', 'a')
 
52
        check_added('a\n')
66
53
 
67
54
        # after commit, now no longer listed
68
 
        tree.commit(message='add "%s"' % (name))
 
55
        bzr('commit', '-m', 'add a')
69
56
        check_added('')