← 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: Ian Clatworthy
  • Date: 2007-11-28 00:07:56 UTC
  • mto: (3054.1.1 ianc-integration)
  • mto: This revision was merged to the branch mainline in revision 3055.
  • Revision ID: ian.clatworthy@internode.on.net-20071128000756-kqm8iqmc9281roii
more cleanups and creation of tutorials directory

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