← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

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

  • Committer: Canonical.com Patch Queue Manager
  • Date: 2009-08-10 11:11:44 UTC
  • mfrom: (4595.1.3 integration)
  • Revision ID: pqm@pqm.ubuntu.com-20090810111144-cnc5w7p0nsemd76s
(mbp) additional fix for bzr add ignored messages

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/blackbox/test_add.py
1
 
# Copyright (C) 2005, 2006, 2007 Canonical Ltd
 
1
# Copyright (C) 2005, 2006, 2007, 2009 Canonical Ltd
2
2
#
3
3
# This program is free software; you can redistribute it and/or modify
4
4
# it under the terms of the GNU General Public License as published by
55
55
        out = self.run_bzr('add')[0]
56
56
        # the ordering is not defined at the moment
57
57
        results = sorted(out.rstrip('\n').split('\n'))
58
 
        self.assertEquals(['If you wish to add ignored files, '
59
 
                           'please add them explicitly by name. '
60
 
                           '("bzr ignored" gives a list)',
61
 
                           'adding .bzrignore',
 
58
        self.assertEquals(['adding .bzrignore',
62
59
                           'adding dir',
63
60
                           'adding dir/sub.txt',
64
 
                           'adding top.txt',
65
 
                           'ignored 1 file(s).'],
 
61
                           'adding top.txt'],
66
62
                          results)
67
63
        out = self.run_bzr('add -v')[0]
68
64
        results = sorted(out.rstrip('\n').split('\n'))
69
 
        self.assertEquals(['If you wish to add ignored files, '\
70
 
                           'please add them explicitly by name. ("bzr ignored" gives a list)',
71
 
                           'ignored CVS matching "CVS"'],
 
65
        self.assertEquals(['ignored CVS matching "CVS"'],
72
66
                          results)
73
67
 
74
68
    def test_add_quiet_is(self):