/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 bzrlib/tests/blackbox/test_modified.py

  • Committer: Marius Kruger
  • Date: 2010-07-10 21:28:56 UTC
  • mto: (5384.1.1 integration)
  • mto: This revision was merged to the branch mainline in revision 5385.
  • Revision ID: marius.kruger@enerweb.co.za-20100710212856-uq4ji3go0u5se7hx
* Update documentation
* add NEWS

Show diffs side-by-side

added added

removed removed

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