/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: Breezy landing bot
  • Author(s): Colin Watson
  • Date: 2020-11-16 21:47:08 UTC
  • mfrom: (7521.1.1 remove-lp-workaround)
  • Revision ID: breezy.the.bot@gmail.com-20201116214708-jos209mgxi41oy15
Remove breezy.git workaround for bazaar.launchpad.net.

Merged from https://code.launchpad.net/~cjwatson/brz/remove-lp-workaround/+merge/393710

Show diffs side-by-side

added added

removed removed

Lines of Context:
breezy/tests/blackbox/test_added.py
1
 
# Copyright (C) 2006-2010 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 import TestCaseWithTransport
 
23
from breezy.branch import Branch
 
24
from breezy.tests import TestCaseWithTransport
25
25
 
26
26
 
27
27
class TestAdded(TestCaseWithTransport):
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',
 
36
                         '"a filename with spaces"\n')
36
37
 
37
38
    def test_added_null_separator(self):
38
39
        """Test that added uses its null operator properly"""
47
48
                command += ' --null'
48
49
 
49
50
            out, err = self.run_bzr(command)
50
 
            self.assertEquals(out, expected)
51
 
            self.assertEquals(err, '')
 
51
            self.assertEqual(out, expected)
 
52
            self.assertEqual(err, '')
52
53
 
53
54
        # in empty directory, nothing added
54
55
        tree = self.make_branch_and_tree('.')
55
56
        check_added('')
56
57
 
57
58
        # with unknown file, still nothing added
58
 
        self.build_tree_contents([(name, 'contents of %s\n' % (name))])
 
59
        self.build_tree_contents(
 
60
            [(name, b'contents of %s\n' % (name.encode('utf-8'),))])
59
61
        check_added('')
60
62
 
61
63
        # after add, shows up in list
62
 
        # bug report 20060119 by Nathan McCallum -- 'bzr added' causes
 
64
        # bug report 20060119 by Nathan McCallum -- 'brz added' causes
63
65
        # NameError
64
66
        tree.add(name)
65
67
        check_added(output, null)
74
76
        self.build_tree(['a/README'])
75
77
        tree.add('README')
76
78
        out, err = self.run_bzr(['added', '--directory=a'])
77
 
        self.assertEquals('README\n', out)
 
79
        self.assertEqual('README\n', out)