1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190
191
192
193
194
195
196
197
198
199
200
201
202
203
204
205
206
207
208
209
210
211
212
213
214
215
216
217
218
219
220
221
222
223
224
225
226
227
228
229
230
231
232
233
234
235
236
237
238
239
240
241
242
243
244
245
246
247
248
249
250
251
252
253
254
255
256
257
258
259
260
261
262
263
264
265
266
267
268
269
270
271
272
273
274
275
276
277
278
279
280
281
282
283
284
285
286
287
288
289
290
291
292
293
294
295
296
297
298
299
300
301
302
303
304
305
306
|
# Copyright (C) 2008 Canonical Ltd
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
# the Free Software Foundation; either version 2 of the License, or
# (at your option) any later version.
#
# This program is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
# along with this program. If not, see <http://www.gnu.org/licenses/>.
"""Test the Import parsing"""
import StringIO
import testtools
from fastimport import (
errors,
parser,
)
class TestLineBasedParser(testtools.TestCase):
def test_push_line(self):
s = StringIO.StringIO("foo\nbar\nbaz\n")
p = parser.LineBasedParser(s)
self.assertEqual('foo', p.next_line())
self.assertEqual('bar', p.next_line())
p.push_line('bar')
self.assertEqual('bar', p.next_line())
self.assertEqual('baz', p.next_line())
self.assertEqual(None, p.next_line())
def test_read_bytes(self):
s = StringIO.StringIO("foo\nbar\nbaz\n")
p = parser.LineBasedParser(s)
self.assertEqual('fo', p.read_bytes(2))
self.assertEqual('o\nb', p.read_bytes(3))
self.assertEqual('ar', p.next_line())
# Test that the line buffer is ignored
p.push_line('bar')
self.assertEqual('baz', p.read_bytes(3))
# Test missing bytes
self.assertRaises(errors.MissingBytes, p.read_bytes, 10)
def test_read_until(self):
# TODO
return
s = StringIO.StringIO("foo\nbar\nbaz\nabc\ndef\nghi\n")
p = parser.LineBasedParser(s)
self.assertEqual('foo\nbar', p.read_until('baz'))
self.assertEqual('abc', p.next_line())
# Test that the line buffer is ignored
p.push_line('abc')
self.assertEqual('def', p.read_until('ghi'))
# Test missing terminator
self.assertRaises(errors.MissingTerminator, p.read_until('>>>'))
# Sample text
_sample_import_text = """
progress completed
# Test blob formats
blob
mark :1
data 4
aaaablob
data 5
bbbbb
# Commit formats
commit refs/heads/master
mark :2
committer bugs bunny <bugs@bunny.org> now
data 14
initial import
M 644 inline README
data 18
Welcome from bugs
commit refs/heads/master
committer <bugs@bunny.org> now
data 13
second commit
from :2
M 644 inline README
data 23
Welcome from bugs, etc.
# Miscellaneous
checkpoint
progress completed
# Test a commit without sub-commands (bug #351717)
commit refs/heads/master
mark :3
author <bugs@bunny.org> now
committer <bugs@bunny.org> now
data 20
first commit, empty
# Test a commit with a heredoc-style (delimited_data) messsage (bug #400960)
commit refs/heads/master
mark :4
author <bugs@bunny.org> now
committer <bugs@bunny.org> now
data <<EOF
Commit with heredoc-style message
EOF
# Test a "submodule"/tree-reference
commit refs/heads/master
mark :5
author <bugs@bunny.org> now
committer <bugs@bunny.org> now
data 15
submodule test
M 160000 rev-id tree-id
# Test features
feature whatever
feature foo=bar
# Test commit with properties
commit refs/heads/master
mark :6
committer <bugs@bunny.org> now
data 18
test of properties
property p1
property p2 5 hohum
property p3 16 alpha
beta
gamma
property p4 8 whatever
# Test a commit with multiple authors
commit refs/heads/master
mark :7
author Fluffy <fluffy@bunny.org> now
author Daffy <daffy@duck.org> now
author Donald <donald@duck.org> now
committer <bugs@bunny.org> now
data 17
multi-author test
"""
class TestImportParser(testtools.TestCase):
def test_iter_commands(self):
s = StringIO.StringIO(_sample_import_text)
p = parser.ImportParser(s)
result = []
for cmd in p.iter_commands():
result.append(cmd)
if cmd.name == 'commit':
for fc in cmd.iter_files():
result.append(fc)
self.assertEqual(len(result), 17)
cmd1 = result.pop(0)
self.assertEqual('progress', cmd1.name)
self.assertEqual('completed', cmd1.message)
cmd2 = result.pop(0)
self.assertEqual('blob', cmd2.name)
self.assertEqual('1', cmd2.mark)
self.assertEqual(':1', cmd2.id)
self.assertEqual('aaaa', cmd2.data)
self.assertEqual(4, cmd2.lineno)
cmd3 = result.pop(0)
self.assertEqual('blob', cmd3.name)
self.assertEqual('@7', cmd3.id)
self.assertEqual(None, cmd3.mark)
self.assertEqual('bbbbb', cmd3.data)
self.assertEqual(7, cmd3.lineno)
cmd4 = result.pop(0)
self.assertEqual('commit', cmd4.name)
self.assertEqual('2', cmd4.mark)
self.assertEqual(':2', cmd4.id)
self.assertEqual('initial import', cmd4.message)
self.assertEqual('bugs bunny', cmd4.committer[0])
self.assertEqual('bugs@bunny.org', cmd4.committer[1])
# FIXME: check timestamp and timezone as well
self.assertEqual(None, cmd4.author)
self.assertEqual(11, cmd4.lineno)
self.assertEqual('refs/heads/master', cmd4.ref)
self.assertEqual(None, cmd4.from_)
self.assertEqual([], cmd4.merges)
file_cmd1 = result.pop(0)
self.assertEqual('filemodify', file_cmd1.name)
self.assertEqual('README', file_cmd1.path)
self.assertEqual(0100644, file_cmd1.mode)
self.assertEqual('Welcome from bugs\n', file_cmd1.data)
cmd5 = result.pop(0)
self.assertEqual('commit', cmd5.name)
self.assertEqual(None, cmd5.mark)
self.assertEqual('@19', cmd5.id)
self.assertEqual('second commit', cmd5.message)
self.assertEqual('', cmd5.committer[0])
self.assertEqual('bugs@bunny.org', cmd5.committer[1])
# FIXME: check timestamp and timezone as well
self.assertEqual(None, cmd5.author)
self.assertEqual(19, cmd5.lineno)
self.assertEqual('refs/heads/master', cmd5.ref)
self.assertEqual(':2', cmd5.from_)
self.assertEqual([], cmd5.merges)
file_cmd2 = result.pop(0)
self.assertEqual('filemodify', file_cmd2.name)
self.assertEqual('README', file_cmd2.path)
self.assertEqual(0100644, file_cmd2.mode)
self.assertEqual('Welcome from bugs, etc.', file_cmd2.data)
cmd6 = result.pop(0)
self.assertEqual(cmd6.name, 'checkpoint')
cmd7 = result.pop(0)
self.assertEqual('progress', cmd7.name)
self.assertEqual('completed', cmd7.message)
cmd = result.pop(0)
self.assertEqual('commit', cmd.name)
self.assertEqual('3', cmd.mark)
self.assertEqual(None, cmd.from_)
cmd = result.pop(0)
self.assertEqual('commit', cmd.name)
self.assertEqual('4', cmd.mark)
self.assertEqual('Commit with heredoc-style message\n', cmd.message)
cmd = result.pop(0)
self.assertEqual('commit', cmd.name)
self.assertEqual('5', cmd.mark)
self.assertEqual('submodule test\n', cmd.message)
file_cmd1 = result.pop(0)
self.assertEqual('filemodify', file_cmd1.name)
self.assertEqual('tree-id', file_cmd1.path)
self.assertEqual(0160000, file_cmd1.mode)
self.assertEqual("rev-id", file_cmd1.dataref)
cmd = result.pop(0)
self.assertEqual('feature', cmd.name)
self.assertEqual('whatever', cmd.feature_name)
self.assertEqual(None, cmd.value)
cmd = result.pop(0)
self.assertEqual('feature', cmd.name)
self.assertEqual('foo', cmd.feature_name)
self.assertEqual('bar', cmd.value)
cmd = result.pop(0)
self.assertEqual('commit', cmd.name)
self.assertEqual('6', cmd.mark)
self.assertEqual('test of properties', cmd.message)
self.assertEqual({
'p1': None,
'p2': u'hohum',
'p3': u'alpha\nbeta\ngamma',
'p4': u'whatever',
}, cmd.properties)
cmd = result.pop(0)
self.assertEqual('commit', cmd.name)
self.assertEqual('7', cmd.mark)
self.assertEqual('multi-author test', cmd.message)
self.assertEqual('', cmd.committer[0])
self.assertEqual('bugs@bunny.org', cmd.committer[1])
self.assertEqual('Fluffy', cmd.author[0])
self.assertEqual('fluffy@bunny.org', cmd.author[1])
self.assertEqual('Daffy', cmd.more_authors[0][0])
self.assertEqual('daffy@duck.org', cmd.more_authors[0][1])
self.assertEqual('Donald', cmd.more_authors[1][0])
self.assertEqual('donald@duck.org', cmd.more_authors[1][1])
def test_done_feature_missing_done(self):
s = StringIO.StringIO("""feature done
""")
p = parser.ImportParser(s)
cmds = p.iter_commands()
self.assertEquals("feature", cmds.next().name)
self.assertRaises(errors.PrematureEndOfStream, cmds.next)
def test_done_with_feature(self):
s = StringIO.StringIO("""feature done
done
more data
""")
p = parser.ImportParser(s)
cmds = p.iter_commands()
self.assertEquals("feature", cmds.next().name)
self.assertRaises(StopIteration, cmds.next)
def test_done_without_feature(self):
s = StringIO.StringIO("""done
more data
""")
p = parser.ImportParser(s)
cmds = p.iter_commands()
self.assertEquals([], list(cmds))
class TestStringParsing(testtools.TestCase):
def test_unquote(self):
s = r'hello \"sweet\" wo\\r\tld'
self.assertEquals(r'hello "sweet" wo\r' + "\tld",
parser._unquote_c_string(s))
class TestPathPairParsing(testtools.TestCase):
def test_path_pair_simple(self):
p = parser.ImportParser("")
self.assertEqual(['foo', 'bar'], p._path_pair("foo bar"))
def test_path_pair_spaces_in_first(self):
p = parser.ImportParser("")
self.assertEqual(['foo bar', 'baz'],
p._path_pair('"foo bar" baz'))
|
