← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/tests/test_testament.py

  • Committer: John Arbash Meinel
  • Date: 2011-05-11 11:35:28 UTC
  • mto: This revision was merged to the branch mainline in revision 5851.
  • Revision ID: john@arbash-meinel.com-20110511113528-qepibuwxicjrbb2h
Break compatibility with python <2.6.

This includes auditing the code for places where we were doing
explicit 'sys.version' checks and removing them as appropriate.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/test_testament.py
1
 
# Copyright (C) 2005, 2006 Canonical Ltd
 
1
# Copyright (C) 2005-2010 Canonical Ltd
2
2
#
3
3
# This program is free software; you can redistribute it and/or modify
4
4
# it under the terms of the GNU General Public License as published by
22
22
 
23
23
from bzrlib import osutils
24
24
from bzrlib.tests import SymlinkFeature, TestCaseWithTransport
25
 
from bzrlib.testament import Testament, StrictTestament, StrictTestament3
 
25
from bzrlib.testament import (
 
26
    Testament,
 
27
    StrictTestament,
 
28
    StrictTestament3,
 
29
    )
26
30
from bzrlib.transform import TreeTransform
27
31
 
28
32
 
129
133
            timestamp=1129025493,
130
134
            timezone=36000,
131
135
            rev_id='test@user-3',
132
 
            committer='Erik B\xe5gfors <test@user>',
 
136
            committer=u'Erik B\xe5gfors <test@user>',
133
137
            revprops={'uni':u'\xb5'}
134
138
            )
135
139
        t = self.from_revision(self.b.repository, 'test@user-3')
136
140
        self.assertEqualDiff(
137
141
            self.expected('sample_unicode').encode('utf-8'), t.as_text())
138
142
 
 
143
    def test_from_tree(self):
 
144
        tree = self.b.repository.revision_tree('test@user-2')
 
145
        testament = self.testament_class().from_revision_tree(tree)
 
146
        text_1 = testament.as_short_text()
 
147
        text_2 = self.from_revision(self.b.repository,
 
148
                                    'test@user-2').as_short_text()
 
149
        self.assertEqual(text_1, text_2)
 
150
 
139
151
    def test___init__(self):
140
152
        revision = self.b.repository.get_revision('test@user-2')
141
 
        inventory = self.b.repository.get_inventory('test@user-2')
142
 
        testament_1 = self.testament_class()(revision, inventory)
 
153
        tree = self.b.repository.revision_tree('test@user-2')
 
154
        testament_1 = self.testament_class()(revision, tree)
143
155
        text_1 = testament_1.as_short_text()
144
156
        text_2 = self.from_revision(self.b.repository,
145
157
                                    'test@user-2').as_short_text()