/brz/remove-bazaar

To get this branch, use:
bzr branch http://gegoxaren.bato24.eu/bzr/brz/remove-bazaar
0.262.1 by Jelmer Vernooij
Fix WorkingTree.conflicts().
1
# Copyright (C) 2010 Jelmer Vernooij
2
# Copyright (C) 2011 Canonical Ltd.
3
#
4
# This program is free software; you can redistribute it and/or modify
5
# it under the terms of the GNU General Public License as published by
6
# the Free Software Foundation; either version 2 of the License, or
7
# (at your option) any later version.
8
#
9
# This program is distributed in the hope that it will be useful,
10
# but WITHOUT ANY WARRANTY; without even the implied warranty of
11
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
12
# GNU General Public License for more details.
13
#
14
# You should have received a copy of the GNU General Public License
15
# along with this program; if not, write to the Free Software
16
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
17
18
"""Tests for Git working trees."""
19
20
from bzrlib import (
21
    conflicts as _mod_conflicts,
22
    )
23
from bzrlib.tests import TestCaseWithTransport
24
25
26
class GitWorkingTreeTests(TestCaseWithTransport):
27
28
    def setUp(self):
29
        super(GitWorkingTreeTests, self).setUp()
30
        self.tree = self.make_branch_and_tree('.', format="git")
31
32
    def test_conflicts(self):
33
        self.assertIsInstance(self.tree.conflicts(),
34
            _mod_conflicts.ConflictList)