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

  • Committer: Vincent Ladeuil
  • Date: 2009-09-19 16:14:10 UTC
  • mto: (4707.2.1 integration)
  • mto: This revision was merged to the branch mainline in revision 4708.
  • Revision ID: v.ladeuil+lp@free.fr-20090919161410-lmlunl2q9kbzd3x0
Fix OSX and FreeBSD failures.

* bzrlib/tests/__init__.py:
(TestCaseWithMemoryTransport._make_test_root): Fixing the problem
at the root, if we usr the real path there, we catch 99% of the
consequences.

* bzrlib/tests/test_osutils.py:
(TestCanonicalRelPath.test_canonical_relpath_simple,
TestCanonicalRelPath.test_canonical_relpath_missing_tail): No need
to use realpath here anymore.

* bzrlib/tests/script.py:
(ScriptRunner.do_rm): OSX and BSD raises a different exception,
and windows too even if that will require real testing (but
osutils._delete_file_or_dir use the same trick for unlink so it's
a pretty safe bet).

* bzrlib/tests/blackbox/test_outside_wt.py:
(TestOutsideWT.test_cwd_log,
TestOutsideWT.test_diff_outside_tree): Watch for OSX trick.

Show diffs side-by-side

added added

removed removed

Lines of Context:
 
1
# Copyright (C) 2006 Canonical Ltd
 
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., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
 
16
 
 
17
"""Blackbox tests for the 'bzr testament' command"""
 
18
 
 
19
 
 
20
from bzrlib.tests.test_testament import (
 
21
    REV_1_SHORT,
 
22
    REV_1_SHORT_STRICT,
 
23
    REV_2_TESTAMENT,
 
24
    TestamentSetup,
 
25
    )
 
26
 
 
27
 
 
28
class TestTestament(TestamentSetup):
 
29
    """Run blackbox tests on 'bzr testament'"""
 
30
 
 
31
    def test_testament_command(self):
 
32
        """Testament containing a file and a directory."""
 
33
        out, err = self.run_bzr('testament --long')
 
34
        self.assertEqualDiff(err, '')
 
35
        self.assertEqualDiff(out, REV_2_TESTAMENT)
 
36
 
 
37
    def test_testament_command_2(self):
 
38
        """Command getting short testament of previous version."""
 
39
        out, err = self.run_bzr('testament -r1')
 
40
        self.assertEqualDiff(err, '')
 
41
        self.assertEqualDiff(out, REV_1_SHORT)
 
42
 
 
43
    def test_testament_command_3(self):
 
44
        """Command getting short testament of previous version."""
 
45
        out, err = self.run_bzr('testament -r1 --strict')
 
46
        self.assertEqualDiff(err, '')
 
47
        self.assertEqualDiff(out, REV_1_SHORT_STRICT)
 
48