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

Fix formatting, remove catch-all for exceptions when opening local repositories.

Show diffs side-by-side

added added

removed removed

Lines of Context:
tests/test_builder.py
46
46
                             stream.getvalue())
47
47
        self.assertEqual(['M 100644 :1 f\xc2\xb5/bar\n'], builder.commit_info)
48
48
 
 
49
    def test_set_file_newline(self):
 
50
        stream = StringIO()
 
51
        builder = tests.GitBranchBuilder(stream)
 
52
        builder.set_file(u'foo\nbar', 'contents\nbar\n', False)
 
53
        self.assertEqualDiff('blob\nmark :1\ndata 13\ncontents\nbar\n\n',
 
54
                             stream.getvalue())
 
55
        self.assertEqual(['M 100644 :1 "foo\\nbar"\n'], builder.commit_info)
 
56
 
49
57
    def test_set_file_executable(self):
50
58
        stream = StringIO()
51
59
        builder = tests.GitBranchBuilder(stream)
62
70
                             stream.getvalue())
63
71
        self.assertEqual(['M 120000 :1 f\xc2\xb5/bar\n'], builder.commit_info)
64
72
 
 
73
    def test_set_link_newline(self):
 
74
        stream = StringIO()
 
75
        builder = tests.GitBranchBuilder(stream)
 
76
        builder.set_link(u'foo\nbar', 'link/contents')
 
77
        self.assertEqualDiff('blob\nmark :1\ndata 13\nlink/contents\n',
 
78
                             stream.getvalue())
 
79
        self.assertEqual(['M 120000 :1 "foo\\nbar"\n'], builder.commit_info)
 
80
 
65
81
    def test_delete_entry(self):
66
82
        stream = StringIO()
67
83
        builder = tests.GitBranchBuilder(stream)
68
84
        builder.delete_entry(u'path/to/f\xb5')
69
85
        self.assertEqual(['D path/to/f\xc2\xb5\n'], builder.commit_info)
70
86
 
 
87
    def test_delete_entry_newline(self):
 
88
        stream = StringIO()
 
89
        builder = tests.GitBranchBuilder(stream)
 
90
        builder.delete_entry(u'path/to/foo\nbar')
 
91
        self.assertEqual(['D "path/to/foo\\nbar"\n'], builder.commit_info)
 
92
 
 
93
    def test_encode_path(self):
 
94
        encode = tests.GitBranchBuilder._encode_path
 
95
        # Unicode is encoded to utf-8
 
96
        self.assertEqual(encode(u'f\xb5'), 'f\xc2\xb5')
 
97
        # The name must be quoted if it starts by a double quote or contains a
 
98
        # newline.
 
99
        self.assertEqual(encode(u'"foo'), '"\\"foo"')
 
100
        self.assertEqual(encode(u'fo\no'), '"fo\\no"')
 
101
        # When the name is quoted, all backslash and quote chars must be
 
102
        # escaped.
 
103
        self.assertEqual(encode(u'fo\\o\nbar'), '"fo\\\\o\\nbar"')
 
104
        self.assertEqual(encode(u'fo"o"\nbar'), '"fo\\"o\\"\\nbar"')
 
105
        # Other control chars, such as \r, need not be escaped.
 
106
        self.assertEqual(encode(u'foo\r\nbar'), '"foo\r\\nbar"')
 
107
 
71
108
    def test_add_and_commit(self):
72
109
        stream = StringIO()
73
110
        builder = tests.GitBranchBuilder(stream)
78
115
                                           timestamp=1194586400,
79
116
                                           timezone='+0100'))
80
117
        self.assertEqualDiff('blob\nmark :1\ndata 13\ncontents\nbar\n\n'
81
 
                             'commit refs/head/master\n'
 
118
                             'commit refs/heads/master\n'
82
119
                             'mark :2\n'
83
120
                             'committer Joe Foo <joe@foo.com> 1194586400 +0100\n'
84
121
                             'data 18\n'
102
139
                            base=r1)
103
140
 
104
141
        self.assertEqualDiff('blob\nmark :1\ndata 13\ncontents\nfoo\n\n'
105
 
                             'commit refs/head/master\n'
 
142
                             'commit refs/heads/master\n'
106
143
                             'mark :2\n'
107
144
                             'committer Joe Foo <joe@foo.com> 1194586400 +0000\n'
108
145
                             'data 5\n'
110
147
                             '\n'
111
148
                             'M 100644 :1 foo\n'
112
149
                             '\n'
113
 
                             'commit refs/head/master\n'
 
150
                             'commit refs/heads/master\n'
114
151
                             'mark :3\n'
115
152
                             'committer Joe Foo <joe@foo.com> 1194586405 +0000\n'
116
153
                             'data 6\n'
117
154
                             'second'
118
155
                             '\n'
119
156
                             '\n'
120
 
                             'commit refs/head/master\n'
 
157
                             'commit refs/heads/master\n'
121
158
                             'mark :4\n'
122
159
                             'committer Joe Foo <joe@foo.com> 1194586410 +0000\n'
123
160
                             'data 5\n'
143
180
                            merge=[r2])
144
181
 
145
182
        self.assertEqualDiff('blob\nmark :1\ndata 13\ncontents\nfoo\n\n'
146
 
                             'commit refs/head/master\n'
 
183
                             'commit refs/heads/master\n'
147
184
                             'mark :2\n'
148
185
                             'committer Joe Foo <joe@foo.com> 1194586400 +0000\n'
149
186
                             'data 5\n'
151
188
                             '\n'
152
189
                             'M 100644 :1 foo\n'
153
190
                             '\n'
154
 
                             'commit refs/head/master\n'
 
191
                             'commit refs/heads/master\n'
155
192
                             'mark :3\n'
156
193
                             'committer Joe Foo <joe@foo.com> 1194586405 +0000\n'
157
194
                             'data 6\n'
158
195
                             'second'
159
196
                             '\n'
160
197
                             '\n'
161
 
                             'commit refs/head/master\n'
 
198
                             'commit refs/heads/master\n'
162
199
                             'mark :4\n'
163
200
                             'committer Joe Foo <joe@foo.com> 1194586410 +0000\n'
164
201
                             'data 5\n'
166
203
                             '\n'
167
204
                             'from :2\n'
168
205
                             '\n'
169
 
                             'commit refs/head/master\n'
 
206
                             'commit refs/heads/master\n'
170
207
                             'mark :5\n'
171
208
                             'committer Joe Foo <joe@foo.com> 1194586415 +0000\n'
172
209
                             'data 5\n'
182
219
        self.assertContainsRe(stream.getvalue(),
183
220
                              r'committer Joe Foo <joe@foo\.com> \d+ \+0000')
184
221
 
 
222
    def test_reset(self):
 
223
        stream = StringIO()
 
224
        builder = tests.GitBranchBuilder(stream)
 
225
        builder.reset()
 
226
        self.assertEqualDiff('reset refs/heads/master\n\n', stream.getvalue())
 
227
 
 
228
    def test_reset_named_ref(self):
 
229
        stream = StringIO()
 
230
        builder = tests.GitBranchBuilder(stream)
 
231
        builder.reset('refs/heads/branch')
 
232
        self.assertEqualDiff('reset refs/heads/branch\n\n', stream.getvalue())
 
233
 
 
234
    def test_reset_revision(self):
 
235
        stream = StringIO()
 
236
        builder = tests.GitBranchBuilder(stream)
 
237
        builder.reset(mark=123)
 
238
        self.assertEqualDiff(
 
239
            'reset refs/heads/master\n'
 
240
            'from :123\n'
 
241
            '\n', stream.getvalue())
 
242
 
185
243
 
186
244
class TestGitBranchBuilderReal(tests.TestCaseInTempDir):
187
245