← 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: Robert J. Tanner
  • Date: 2009-06-10 03:56:49 UTC
  • mfrom: (4423 +trunk)
  • mto: This revision was merged to the branch mainline in revision 4425.
  • Revision ID: tanner@real-time.com-20090610035649-7rfx4cls4550zc3c
Merge 1.15.1 back to trunk

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/blackbox/test_add.py
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 some of these files, please'\
59
 
                           ' add them by name.',
 
58
        self.assertEquals(['If you wish to add ignored files, '
 
59
                           'please add them explicitly by name. '
 
60
                           '("bzr ignored" gives a list)',
60
61
                           'adding .bzrignore',
61
62
                           'adding dir',
62
63
                           'adding dir/sub.txt',
65
66
                          results)
66
67
        out = self.run_bzr('add -v')[0]
67
68
        results = sorted(out.rstrip('\n').split('\n'))
68
 
        self.assertEquals(['If you wish to add some of these files, please'\
69
 
                           ' add them by name.',
 
69
        self.assertEquals(['If you wish to add ignored files, '\
 
70
                           'please add them explicitly by name. ("bzr ignored" gives a list)',
70
71
                           'ignored CVS matching "CVS"'],
71
72
                          results)
72
73