/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 tests/test_ids.py

  • Committer: John Arbash Meinel
  • Date: 2007-03-06 15:43:47 UTC
  • mto: This revision was merged to the branch mainline in revision 2321.
  • Revision ID: john@arbash-meinel.com-20070306154347-ilhp9u2chs2nxm3b
The parameter is 'conflict_path' not 'conflict_file_path'

Show diffs side-by-side

added added

removed removed

Lines of Context:
tests/test_ids.py
1
 
# Copyright (C) 2007 Jelmer Vernooij <jelmer@samba.org>
2
 
#
3
 
# This program is free software; you can redistribute it and/or modify
4
 
# it under the terms of the GNU General Public License as published by
5
 
# the Free Software Foundation; either version 2 of the License, or
6
 
# (at your option) any later version.
7
 
#
8
 
# This program is distributed in the hope that it will be useful,
9
 
# but WITHOUT ANY WARRANTY; without even the implied warranty of
10
 
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
11
 
# GNU General Public License for more details.
12
 
#
13
 
# You should have received a copy of the GNU General Public License
14
 
# along with this program; if not, write to the Free Software
15
 
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
16
 
 
17
 
from bzrlib.plugins.git import tests
18
 
from bzrlib.plugins.git.mapping import default_mapping
19
 
 
20
 
 
21
 
class TestRevidConversion(tests.TestCase):
22
 
 
23
 
    def test_simple_git_to_bzr_revision_id(self):
24
 
        self.assertEqual("git-experimental:"
25
 
                         "c6a4d8f1fa4ac650748e647c4b1b368f589a7356",
26
 
                         default_mapping.revision_id_foreign_to_bzr(
27
 
                            "c6a4d8f1fa4ac650748e647c4b1b368f589a7356"))
28
 
 
29
 
    def test_simple_bzr_to_git_revision_id(self):
30
 
        self.assertEqual("c6a4d8f1fa4ac650748e647c4b1b368f589a7356",
31
 
                         default_mapping.revision_id_bzr_to_foreign(
32
 
                            "git-experimental:"
33
 
                            "c6a4d8f1fa4ac650748e647c4b1b368f589a7356"))