13
13
# You should have received a copy of the GNU General Public License
14
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
15
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
17
17
"""Test testaments for gpg signing."""
19
19
# TODO: Testaments with x-bits
25
from bzrlib.selftest import TestCaseInTempDir
26
from bzrlib.selftest.treeshape import build_tree_contents
27
from bzrlib.branch import Branch
28
from bzrlib.testament import Testament
29
from bzrlib.trace import mutter
30
from bzrlib.osutils import has_symlinks
33
class TestamentTests(TestCaseInTempDir):
23
from bzrlib import osutils
24
from bzrlib.tests import TestCaseWithTransport
25
from bzrlib.testament import (
30
from bzrlib.transform import TreeTransform
31
from bzrlib.tests.features import (
36
class TestamentSetup(TestCaseWithTransport):
36
super(TestamentTests, self).setUp()
37
b = self.b = Branch.initialize('.')
38
b.commit(message='initial null commit',
39
super(TestamentSetup, self).setUp()
40
self.wt = self.make_branch_and_tree('.', format='development-subtree')
41
self.wt.set_root_id('TREE_ROT')
42
b = self.b = self.wt.branch
43
b.nick = "test branch"
44
self.wt.commit(message='initial null commit',
39
45
committer='test@user',
40
46
timestamp=1129025423, # 'Tue Oct 11 20:10:23 2005'
42
48
rev_id='test@user-1')
43
build_tree_contents([('hello', 'contents of hello file'),
49
self.build_tree_contents([('hello', 'contents of hello file'),
45
51
('src/foo.c', 'int main()\n{\n}\n')])
46
b.add(['hello', 'src', 'src/foo.c'],
47
['hello-id', 'src-id', 'foo.c-id'])
48
b.commit(message='add files and directories',
52
self.wt.add(['hello', 'src', 'src/foo.c'],
53
['hello-id', 'src-id', 'foo.c-id'])
54
tt = TreeTransform(self.wt)
55
trans_id = tt.trans_id_tree_path('hello')
56
tt.set_executability(True, trans_id)
58
self.wt.commit(message='add files and directories',
49
59
timestamp=1129025483,
51
61
rev_id='test@user-2',
52
62
committer='test@user')
65
class TestamentTests(TestamentSetup):
67
def testament_class(self):
70
def expected(self, key):
71
return texts[self.testament_class()][key]
73
def from_revision(self, repository, revision_id):
74
return self.testament_class().from_revision(repository, revision_id)
54
76
def test_null_testament(self):
55
77
"""Testament for a revision with no contents."""
56
t = Testament.from_revision(self.b, 'test@user-1')
78
t = self.from_revision(self.b.repository, 'test@user-1')
57
79
ass = self.assertTrue
58
80
eq = self.assertEqual
59
81
ass(isinstance(t, Testament))
65
87
def test_testment_text_form(self):
66
88
"""Conversion of testament to canonical text form."""
67
t = Testament.from_revision(self.b, 'test@user-1')
89
t = self.from_revision(self.b.repository, 'test@user-1')
68
90
text_form = t.as_text()
69
91
self.log('testament text form:\n' + text_form)
70
self.assertEqual(text_form, REV_1_TESTAMENT)
92
self.assertEqualDiff(text_form, self.expected('rev_1'))
93
short_text_form = t.as_short_text()
94
self.assertEqualDiff(short_text_form, self.expected('rev_1_short'))
72
96
def test_testament_with_contents(self):
73
97
"""Testament containing a file and a directory."""
74
t = Testament.from_revision(self.b, 'test@user-2')
98
t = self.from_revision(self.b.repository, 'test@user-2')
75
99
text_form = t.as_text()
76
100
self.log('testament text form:\n' + text_form)
77
self.assertEqualDiff(text_form, REV_2_TESTAMENT)
101
self.assertEqualDiff(text_form, self.expected('rev_2'))
78
102
actual_short = t.as_short_text()
79
self.assertEqualDiff(actual_short, REV_2_SHORT)
81
def test_testament_command(self):
82
"""Testament containing a file and a directory."""
83
out, err = self.run_bzr_captured(['testament', '--long'])
84
self.assertEqualDiff(err, '')
85
self.assertEqualDiff(out, REV_2_TESTAMENT)
87
def test_testament_command_2(self):
88
"""Command getting short testament of previous version."""
89
out, err = self.run_bzr_captured(['testament', '-r1'])
90
self.assertEqualDiff(err, '')
91
self.assertEqualDiff(out, REV_1_SHORT)
103
self.assertEqualDiff(actual_short, self.expected('rev_2_short'))
93
105
def test_testament_symlinks(self):
94
106
"""Testament containing symlink (where possible)"""
95
if not has_symlinks():
107
self.requireFeature(SymlinkFeature)
97
108
os.symlink('wibble/linktarget', 'link')
98
self.b.add(['link'], ['link-id'])
99
self.b.commit(message='add symlink',
109
self.wt.add(['link'], ['link-id'])
110
self.wt.commit(message='add symlink',
100
111
timestamp=1129025493,
102
113
rev_id='test@user-3',
103
114
committer='test@user')
104
t = Testament.from_revision(self.b, 'test@user-3')
105
self.assertEqualDiff(t.as_text(), REV_3_TESTAMENT)
115
t = self.from_revision(self.b.repository, 'test@user-3')
116
self.assertEqualDiff(t.as_text(), self.expected('rev_3'))
107
118
def test_testament_revprops(self):
108
119
"""Testament to revision with extra properties"""
109
120
props = dict(flavor='sour cherry\ncream cheese',
111
self.b.commit(message='revision with properties',
124
self.wt.commit(message='revision with properties',
112
125
timestamp=1129025493,
114
127
rev_id='test@user-3',
115
128
committer='test@user',
117
t = Testament.from_revision(self.b, 'test@user-3')
118
self.assertEqualDiff(t.as_text(), REV_PROPS_TESTAMENT)
130
t = self.from_revision(self.b.repository, 'test@user-3')
131
self.assertEqualDiff(t.as_text(), self.expected('rev_props'))
133
def test_testament_unicode_commit_message(self):
135
message=u'non-ascii commit \N{COPYRIGHT SIGN} me',
136
timestamp=1129025493,
138
rev_id='test@user-3',
139
committer=u'Erik B\xe5gfors <test@user>',
140
revprops={'uni':u'\xb5'}
142
t = self.from_revision(self.b.repository, 'test@user-3')
143
self.assertEqualDiff(
144
self.expected('sample_unicode').encode('utf-8'), t.as_text())
146
def test_from_tree(self):
147
tree = self.b.repository.revision_tree('test@user-2')
148
testament = self.testament_class().from_revision_tree(tree)
149
text_1 = testament.as_short_text()
150
text_2 = self.from_revision(self.b.repository,
151
'test@user-2').as_short_text()
152
self.assertEqual(text_1, text_2)
120
154
def test___init__(self):
121
revision = self.b.get_revision('test@user-2')
122
inventory = self.b.get_inventory('test@user-2')
123
testament_1 = Testament(revision, inventory).as_short_text()
124
testament_2 = Testament.from_revision(self.b,
125
'test@user-2').as_short_text()
126
self.assertEqual(testament_1, testament_2)
155
revision = self.b.repository.get_revision('test@user-2')
156
tree = self.b.repository.revision_tree('test@user-2')
157
testament_1 = self.testament_class()(revision, tree)
158
text_1 = testament_1.as_short_text()
159
text_2 = self.from_revision(self.b.repository,
160
'test@user-2').as_short_text()
161
self.assertEqual(text_1, text_2)
164
class TestamentTestsStrict(TestamentTests):
166
def testament_class(self):
167
return StrictTestament
170
class TestamentTestsStrict2(TestamentTests):
172
def testament_class(self):
173
return StrictTestament3
129
176
REV_1_TESTAMENT = """\
130
177
bazaar-ng testament version 1
207
419
symlink link link-id wibble/linktarget
208
420
directory src src-id
209
421
file src/foo.c foo.c-id a2a049c20f908ae31b231d98779eb63c66448f24
428
REV_3_TESTAMENT_STRICT = """\
429
bazaar-ng testament version 2.1
430
revision-id: test@user-3
432
timestamp: 1129025493
439
file hello hello-id 34dd0ac19a24bf80c4d33b5c8960196e8d8d1f73 test@user-2 yes
440
symlink link link-id wibble/linktarget test@user-3 no
441
directory src src-id test@user-2 no
442
file src/foo.c foo.c-id a2a049c20f908ae31b231d98779eb63c66448f24 test@user-2 no
449
REV_3_TESTAMENT_STRICT3 = """\
450
bazaar testament version 3 strict
451
revision-id: test@user-3
453
timestamp: 1129025493
460
directory . TREE_ROT test@user-1 no
461
file hello hello-id 34dd0ac19a24bf80c4d33b5c8960196e8d8d1f73 test@user-2 yes
462
symlink link link-id wibble/linktarget test@user-3 no
463
directory src src-id test@user-2 no
464
file src/foo.c foo.c-id a2a049c20f908ae31b231d98779eb63c66448f24 test@user-2 no
471
SAMPLE_UNICODE_TESTAMENT = u"""\
472
bazaar-ng testament version 1
473
revision-id: test@user-3
474
committer: Erik B\xe5gfors <test@user>
475
timestamp: 1129025493
480
non-ascii commit \N{COPYRIGHT SIGN} me
482
file hello hello-id 34dd0ac19a24bf80c4d33b5c8960196e8d8d1f73
484
file src/foo.c foo.c-id a2a049c20f908ae31b231d98779eb63c66448f24
493
SAMPLE_UNICODE_TESTAMENT_STRICT = u"""\
494
bazaar-ng testament version 2.1
495
revision-id: test@user-3
496
committer: Erik B\xe5gfors <test@user>
497
timestamp: 1129025493
502
non-ascii commit \N{COPYRIGHT SIGN} me
504
file hello hello-id 34dd0ac19a24bf80c4d33b5c8960196e8d8d1f73 test@user-2 yes
505
directory src src-id test@user-2 no
506
file src/foo.c foo.c-id a2a049c20f908ae31b231d98779eb63c66448f24 test@user-2 no
515
SAMPLE_UNICODE_TESTAMENT_STRICT3 = u"""\
516
bazaar testament version 3 strict
517
revision-id: test@user-3
518
committer: Erik B\xe5gfors <test@user>
519
timestamp: 1129025493
524
non-ascii commit \N{COPYRIGHT SIGN} me
526
directory . TREE_ROT test@user-1 no
527
file hello hello-id 34dd0ac19a24bf80c4d33b5c8960196e8d8d1f73 test@user-2 yes
528
directory src src-id test@user-2 no
529
file src/foo.c foo.c-id a2a049c20f908ae31b231d98779eb63c66448f24 test@user-2 no
539
Testament: { 'rev_1': REV_1_TESTAMENT,
540
'rev_1_short': REV_1_SHORT,
541
'rev_2': REV_2_TESTAMENT,
542
'rev_2_short': REV_2_SHORT,
543
'rev_3': REV_3_TESTAMENT,
544
'rev_props': REV_PROPS_TESTAMENT,
545
'sample_unicode': SAMPLE_UNICODE_TESTAMENT,
547
StrictTestament: {'rev_1': REV_1_STRICT_TESTAMENT,
548
'rev_1_short': REV_1_SHORT_STRICT,
549
'rev_2': REV_2_STRICT_TESTAMENT,
550
'rev_2_short': REV_2_SHORT_STRICT,
551
'rev_3': REV_3_TESTAMENT_STRICT,
552
'rev_props': REV_PROPS_TESTAMENT_STRICT,
553
'sample_unicode': SAMPLE_UNICODE_TESTAMENT_STRICT,
555
StrictTestament3: {'rev_1': REV_1_STRICT_TESTAMENT3,
556
'rev_1_short': REV_1_SHORT_STRICT3,
557
'rev_2': REV_2_STRICT_TESTAMENT3,
558
'rev_2_short': REV_2_SHORT_STRICT3,
559
'rev_3': REV_3_TESTAMENT_STRICT3,
560
'rev_props': REV_PROPS_TESTAMENT_STRICT3,
561
'sample_unicode': SAMPLE_UNICODE_TESTAMENT_STRICT3,