/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_modified.py

  • Committer: Jelmer Vernooij
  • Date: 2019-02-03 01:42:11 UTC
  • mto: This revision was merged to the branch mainline in revision 7267.
  • Revision ID: jelmer@jelmer.uk-20190203014211-poj1fv922sejfsb4
Don't require that short git shas have an even number of characters.

Show diffs side-by-side

added added

removed removed

Lines of Context:
breezy/tests/blackbox/test_modified.py
1
 
# Copyright (C) 2006 Canonical Ltd
 
1
# Copyright (C) 2008, 2009, 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 modified', which shows modified files."""
 
19
"""Black-box tests for 'brz modified', which shows modified files."""
20
20
 
21
21
import os
22
22
 
23
 
from bzrlib.branch import Branch
24
 
from bzrlib.tests.blackbox import ExternalBase
25
 
 
26
 
class TestModified(ExternalBase):
 
23
from breezy.branch import Branch
 
24
from breezy.tests import TestCaseWithTransport
 
25
 
 
26
 
 
27
class TestModified(TestCaseWithTransport):
27
28
 
28
29
    def test_modified(self):
29
30
        """Test that 'modified' command reports modified files"""
31
32
 
32
33
    def test_modified_with_spaces(self):
33
34
        """Test that 'modified' command reports modified files with spaces in their names quoted"""
34
 
        self._test_modified('a filename with spaces', '"a filename with spaces"')
 
35
        self._test_modified('a filename with spaces',
 
36
                            '"a filename with spaces"')
35
37
 
36
38
    def _test_modified(self, name, output):
37
39
 
40
42
            if null:
41
43
                command += ' --null'
42
44
            out, err = self.run_bzr(command)
43
 
            self.assertEquals(out, expected)
44
 
            self.assertEquals(err, '')
 
45
            self.assertEqual(out, expected)
 
46
            self.assertEqual(err, '')
45
47
 
46
48
        # in empty directory, nothing modified
47
49
        tree = self.make_branch_and_tree('.')
48
50
        check_modified('')
49
51
 
50
52
        # with unknown file, still nothing modified
51
 
        self.build_tree_contents([(name, 'contents of %s\n' % (name))])
 
53
        self.build_tree_contents(
 
54
            [(name, b'contents of %s\n' % (name.encode('utf-8')))])
52
55
        check_modified('')
53
56
 
54
57
        # after add, not modified
60
63
        check_modified('')
61
64
 
62
65
        # modify the file
63
 
        self.build_tree_contents([(name, 'changed\n')])
 
66
        self.build_tree_contents([(name, b'changed\n')])
64
67
        check_modified(output + '\n')
65
68
 
66
69
        # check null seps - use the unquoted raw name here
67
70
        check_modified(name + '\0', null=True)
68
71
 
69
72
        # now commit the file and it's no longer modified
70
 
        tree.commit(message='modified %s' %(name))
 
73
        tree.commit(message='modified %s' % (name))
71
74
        check_modified('')
72
75
 
 
76
    def test_modified_directory(self):
 
77
        """Test --directory option"""
 
78
        tree = self.make_branch_and_tree('a')
 
79
        self.build_tree(['a/README'])
 
80
        tree.add('README')
 
81
        tree.commit('r1')
 
82
        self.build_tree_contents([('a/README', b'changed\n')])
 
83
        out, err = self.run_bzr(['modified', '--directory=a'])
 
84
        self.assertEqual('README\n', out)