← 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: Aaron Bentley
  • Date: 2009-03-10 04:55:49 UTC
  • mto: This revision was merged to the branch mainline in revision 4112.
  • Revision ID: aaron@aaronbentley.com-20090310045549-j5jmgq190872oem7
Remove locking decorator

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
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
26
 
 
27
 
class TestAdded(TestCaseInTempDir):
 
24
from bzrlib.tests.blackbox import ExternalBase
 
25
 
 
26
 
 
27
class TestAdded(ExternalBase):
28
28
 
29
29
    def test_added(self):
30
30
        """Test that 'added' command reports added files"""
31
 
 
32
 
        def check_added(expected):
33
 
            out, err = self.run_bzr_captured(['added'])
 
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)
34
50
            self.assertEquals(out, expected)
35
51
            self.assertEquals(err, '')
36
52
 
37
 
        def bzr(*args):
38
 
            self.run_bzr(*args)
39
 
 
40
53
        # in empty directory, nothing added
41
 
        bzr('init')
 
54
        tree = self.make_branch_and_tree('.')
42
55
        check_added('')
43
56
 
44
57
        # with unknown file, still nothing added
45
 
        build_tree_contents([('a', 'contents of a\n')])
 
58
        self.build_tree_contents([(name, 'contents of %s\n' % (name))])
46
59
        check_added('')
47
60
 
48
61
        # after add, shows up in list
49
62
        # bug report 20060119 by Nathan McCallum -- 'bzr added' causes
50
63
        # NameError
51
 
        bzr('add', 'a')
52
 
        check_added('a\n')
 
64
        tree.add(name)
 
65
        check_added(output, null)
53
66
 
54
67
        # after commit, now no longer listed
55
 
        bzr('commit', '-m', 'add a')
 
68
        tree.commit(message='add "%s"' % (name))
56
69
        check_added('')