← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

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

merge permissions branch, also fixup tests so they are lined up with bzr.dev to help prevent conflicts.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/blackbox/test_too_much.py
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
17
17
 
 
18
# Mr. Smoketoomuch: I'm sorry?
 
19
# Mr. Bounder: You'd better cut down a little then.
 
20
# Mr. Smoketoomuch: Oh, I see! Smoke too much so I'd better cut down a little
 
21
#                   then!
18
22
 
19
23
"""Black-box tests for bzr.
20
24
 
666
670
    def test_add_reports(self):
667
671
        """add command prints the names of added files."""
668
672
        b = Branch.initialize('.')
669
 
        self.build_tree(['top.txt', 'dir/', 'dir/sub.txt'])
 
673
        self.build_tree(['top.txt', 'dir/', 'dir/sub.txt', 'CVS'])
670
674
        out = self.run_bzr_captured(['add'], retcode=0)[0]
671
675
        # the ordering is not defined at the moment
672
676
        results = sorted(out.rstrip('\n').split('\n'))
673
 
        self.assertEquals(['added dir',
 
677
        self.assertEquals(['If you wish to add some of these files, please'\
 
678
                           ' add them by name.',
 
679
                           'added dir',
674
680
                           'added dir/sub.txt',
675
 
                           'added top.txt',],
 
681
                           'added top.txt',
 
682
                           'ignored 1 file(s) matching "CVS"'],
 
683
                          results)
 
684
        out = self.run_bzr_captured(['add', '-v'], retcode=0)[0]
 
685
        results = sorted(out.rstrip('\n').split('\n'))
 
686
        self.assertEquals(['If you wish to add some of these files, please'\
 
687
                           ' add them by name.',
 
688
                           'ignored CVS matching "CVS"'],
676
689
                          results)
677
690
 
678
691
    def test_add_quiet_is(self):