← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/selftest/testinv.py

[merge] aaron, various fixes

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/selftest/testinv.py
164
164
                          "old_label", self.tree_1,
165
165
                          "/dev/null", None, None,
166
166
                          output)
167
 
        self.assertEqual(output.getvalue(), "--- old_label\n"
168
 
                                            "+++ /dev/null\n"
 
167
        self.assertEqual(output.getvalue(), "--- old_label\t\n"
 
168
                                            "+++ /dev/null\t\n"
169
169
                                            "@@ -1,1 +0,0 @@\n"
170
170
                                            "-foo\n"
171
171
                                            "\n")
176
176
                          "new_label", self.tree_1,
177
177
                          "/dev/null", None, None,
178
178
                          output, reverse=True)
179
 
        self.assertEqual(output.getvalue(), "--- /dev/null\n"
180
 
                                            "+++ new_label\n"
 
179
        self.assertEqual(output.getvalue(), "--- /dev/null\t\n"
 
180
                                            "+++ new_label\t\n"
181
181
                                            "@@ -0,0 +1,1 @@\n"
182
182
                                            "+foo\n"
183
183
                                            "\n")
188
188
                          "/dev/null", self.tree_1, 
189
189
                          "new_label", self.file_2, self.tree_2,
190
190
                          output)
191
 
        self.assertEqual(output.getvalue(), "--- /dev/null\n"
192
 
                                            "+++ new_label\n"
 
191
        self.assertEqual(output.getvalue(), "--- /dev/null\t\n"
 
192
                                            "+++ new_label\t\n"
193
193
                                            "@@ -1,1 +1,1 @@\n"
194
194
                                            "-foo\n"
195
195
                                            "+bar\n"