← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/selftest/testinv.py

Merge from mpool.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/selftest/testinv.py
165
165
                          "old_label", self.tree_1,
166
166
                          "/dev/null", None, None,
167
167
                          output)
168
 
        self.assertEqual(output.getvalue(), "--- old_label\n"
169
 
                                            "+++ /dev/null\n"
 
168
        self.assertEqual(output.getvalue(), "--- old_label\t\n"
 
169
                                            "+++ /dev/null\t\n"
170
170
                                            "@@ -1,1 +0,0 @@\n"
171
171
                                            "-foo\n"
172
172
                                            "\n")
177
177
                          "new_label", self.tree_1,
178
178
                          "/dev/null", None, None,
179
179
                          output, reverse=True)
180
 
        self.assertEqual(output.getvalue(), "--- /dev/null\n"
181
 
                                            "+++ new_label\n"
 
180
        self.assertEqual(output.getvalue(), "--- /dev/null\t\n"
 
181
                                            "+++ new_label\t\n"
182
182
                                            "@@ -0,0 +1,1 @@\n"
183
183
                                            "+foo\n"
184
184
                                            "\n")
189
189
                          "/dev/null", self.tree_1, 
190
190
                          "new_label", self.file_2, self.tree_2,
191
191
                          output)
192
 
        self.assertEqual(output.getvalue(), "--- /dev/null\n"
193
 
                                            "+++ new_label\n"
 
192
        self.assertEqual(output.getvalue(), "--- /dev/null\t\n"
 
193
                                            "+++ new_label\t\n"
194
194
                                            "@@ -1,1 +1,1 @@\n"
195
195
                                            "-foo\n"
196
196
                                            "+bar\n"
241
241
        # with fake parent entries.
242
242
        super(TestSnapshot, self).setUp()
243
243
        self.branch = Branch.initialize('.')
244
 
        self.build_tree(['subdir/', 'subdir/file'])
 
244
        self.build_tree(['subdir/', 'subdir/file'], line_endings='binary')
245
245
        self.branch.working_tree().add(['subdir', 'subdir/file'],
246
246
                                       ['dirid', 'fileid'])
247
247
        if has_symlinks():