← 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: Robert Collins
  • Date: 2010-04-08 04:34:03 UTC
  • mfrom: (5138 +trunk)
  • mto: This revision was merged to the branch mainline in revision 5139.
  • Revision ID: robertc@robertcollins.net-20100408043403-56z0d07vdqrx7f3t
Update bugfix for 528114 to trunk.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/blackbox/test_added.py
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
 
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 
16
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
17
17
 
18
18
 
19
19
"""Black-box tests for 'bzr added', which shows newly-added files."""
23
23
from bzrlib.branch import Branch
24
24
from bzrlib.tests.blackbox import ExternalBase
25
25
 
 
26
 
26
27
class TestAdded(ExternalBase):
27
28
 
28
29
    def test_added(self):
29
30
        """Test that 'added' command reports added files"""
30
 
 
31
 
        def check_added(expected):
32
 
            out, err = self.run_bzr('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)
33
50
            self.assertEquals(out, expected)
34
51
            self.assertEquals(err, '')
35
52
 
38
55
        check_added('')
39
56
 
40
57
        # with unknown file, still nothing added
41
 
        self.build_tree_contents([('a', 'contents of a\n')])
 
58
        self.build_tree_contents([(name, 'contents of %s\n' % (name))])
42
59
        check_added('')
43
60
 
44
61
        # after add, shows up in list
45
62
        # bug report 20060119 by Nathan McCallum -- 'bzr added' causes
46
63
        # NameError
47
 
        tree.add('a')
48
 
        check_added('a\n')
 
64
        tree.add(name)
 
65
        check_added(output, null)
49
66
 
50
67
        # after commit, now no longer listed
51
 
        tree.commit(message='add a')
 
68
        tree.commit(message='add "%s"' % (name))
52
69
        check_added('')