/brz/remove-bazaar

To get this branch, use:
bzr branch http://gegoxaren.bato24.eu/bzr/brz/remove-bazaar

« back to all changes in this revision

Viewing changes to breezy/tests/blackbox/test_added.py

  • Committer: Jelmer Vernooij
  • Date: 2018-07-08 14:45:27 UTC
  • mto: This revision was merged to the branch mainline in revision 7036.
  • Revision ID: jelmer@jelmer.uk-20180708144527-codhlvdcdg9y0nji
Fix a bunch of merge tests.

Show diffs side-by-side

added added

removed removed

Lines of Context:
breezy/tests/blackbox/test_added.py
1
 
# Copyright (C) 2006 Canonical Ltd
 
1
# Copyright (C) 2006-2010, 2016 Canonical Ltd
2
2
# -*- coding: utf-8 -*-
3
3
#
4
4
# This program is free software; you can redistribute it and/or modify
16
16
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
17
17
 
18
18
 
19
 
"""Black-box tests for 'bzr added', which shows newly-added files."""
 
19
"""Black-box tests for 'brz added', which shows newly-added files."""
20
20
 
21
21
import os
22
22
 
23
 
from bzrlib.branch import Branch
24
 
from bzrlib.tests.blackbox import ExternalBase
25
 
 
26
 
 
27
 
class TestAdded(ExternalBase):
 
23
from breezy.branch import Branch
 
24
from breezy.tests import TestCaseWithTransport
 
25
 
 
26
 
 
27
class TestAdded(TestCaseWithTransport):
28
28
 
29
29
    def test_added(self):
30
30
        """Test that 'added' command reports added files"""
31
 
        self._test_added('a', 'a\n')
 
31
        self._test_added('a', b'a\n')
32
32
 
33
33
    def test_added_with_spaces(self):
34
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')
 
35
        self._test_added('a filename with spaces', b'"a filename with spaces"\n')
36
36
 
37
37
    def test_added_null_separator(self):
38
38
        """Test that added uses its null operator properly"""
39
 
        self._test_added('a', 'a\0', null=True)
 
39
        self._test_added('a', b'a\0', null=True)
40
40
 
41
41
    def _test_added(self, name, output, null=False):
42
42
 
47
47
                command += ' --null'
48
48
 
49
49
            out, err = self.run_bzr(command)
50
 
            self.assertEquals(out, expected)
51
 
            self.assertEquals(err, '')
 
50
            self.assertEqual(out, expected)
 
51
            self.assertEqual(err, b'')
52
52
 
53
53
        # in empty directory, nothing added
54
54
        tree = self.make_branch_and_tree('.')
55
 
        check_added('')
 
55
        check_added(b'')
56
56
 
57
57
        # with unknown file, still nothing added
58
 
        self.build_tree_contents([(name, 'contents of %s\n' % (name))])
59
 
        check_added('')
 
58
        self.build_tree_contents([(name, b'contents of %s\n' % (name.encode('utf-8'),))])
 
59
        check_added(b'')
60
60
 
61
61
        # after add, shows up in list
62
 
        # bug report 20060119 by Nathan McCallum -- 'bzr added' causes
 
62
        # bug report 20060119 by Nathan McCallum -- 'brz added' causes
63
63
        # NameError
64
64
        tree.add(name)
65
65
        check_added(output, null)
66
66
 
67
67
        # after commit, now no longer listed
68
68
        tree.commit(message='add "%s"' % (name))
69
 
        check_added('')
 
69
        check_added(b'')
 
70
 
 
71
    def test_added_directory(self):
 
72
        """Test --directory option"""
 
73
        tree = self.make_branch_and_tree('a')
 
74
        self.build_tree(['a/README'])
 
75
        tree.add('README')
 
76
        out, err = self.run_bzr(['added', '--directory=a'])
 
77
        self.assertEqual(b'README\n', out)