/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: Breezy landing bot
  • Author(s): Jelmer Vernooij
  • Date: 2018-03-25 11:54:30 UTC
  • mfrom: (6855.4.10 more-bees)
  • Revision ID: breezy.the.bot@gmail.com-20180325115430-75xnlbrmzjoomd83
Add more bees. In particular:

* for file ids
* for revision ids
* for file contents in build_tree_contents()

Merged from https://code.launchpad.net/~jelmer/brz/more-bees/+merge/337919

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
 
23
from breezy.branch import Branch
 
24
from breezy.tests import TestCaseWithTransport
25
25
 
26
 
class TestModified(ExternalBase):
 
26
class TestModified(TestCaseWithTransport):
27
27
 
28
28
    def test_modified(self):
29
29
        """Test that 'modified' command reports modified files"""
40
40
            if null:
41
41
                command += ' --null'
42
42
            out, err = self.run_bzr(command)
43
 
            self.assertEquals(out, expected)
44
 
            self.assertEquals(err, '')
 
43
            self.assertEqual(out, expected)
 
44
            self.assertEqual(err, '')
45
45
 
46
46
        # in empty directory, nothing modified
47
47
        tree = self.make_branch_and_tree('.')
48
48
        check_modified('')
49
49
 
50
50
        # with unknown file, still nothing modified
51
 
        self.build_tree_contents([(name, 'contents of %s\n' % (name))])
 
51
        self.build_tree_contents([(name, b'contents of %s\n' % (name))])
52
52
        check_modified('')
53
53
 
54
54
        # after add, not modified
60
60
        check_modified('')
61
61
 
62
62
        # modify the file
63
 
        self.build_tree_contents([(name, 'changed\n')])
 
63
        self.build_tree_contents([(name, b'changed\n')])
64
64
        check_modified(output + '\n')
65
65
 
66
66
        # check null seps - use the unquoted raw name here
70
70
        tree.commit(message='modified %s' %(name))
71
71
        check_modified('')
72
72
 
 
73
    def test_modified_directory(self):
 
74
        """Test --directory option"""
 
75
        tree = self.make_branch_and_tree('a')
 
76
        self.build_tree(['a/README'])
 
77
        tree.add('README')
 
78
        tree.commit('r1')
 
79
        self.build_tree_contents([('a/README', b'changed\n')])
 
80
        out, err = self.run_bzr(['modified', '--directory=a'])
 
81
        self.assertEqual('README\n', out)