← 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: Martin Pool
  • Date: 2009-08-15 08:07:50 UTC
  • mto: This revision was merged to the branch mainline in revision 4614.
  • Revision ID: mbp@sourcefrog.net-20090815080750-kw8fh8trba5euzoh
Change overly-tight selftest test to use a re

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/blackbox/test_add.py
1
 
# Copyright (C) 2005, 2006, 2007, 2009 Canonical Ltd
 
1
# Copyright (C) 2005, 2006, 2007 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(['adding .bzrignore',
 
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',
59
62
                           'adding dir',
60
63
                           'adding dir/sub.txt',
61
 
                           'adding top.txt'],
 
64
                           'adding top.txt',
 
65
                           'ignored 1 file(s).'],
62
66
                          results)
63
67
        out = self.run_bzr('add -v')[0]
64
68
        results = sorted(out.rstrip('\n').split('\n'))
65
 
        self.assertEquals(['ignored CVS matching "CVS"'],
 
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"'],
66
72
                          results)
67
73
 
68
74
    def test_add_quiet_is(self):