← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/tests/test_inv.py

Merge bzr.dev

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/test_inv.py
196
196
                          "old_label", self.tree_1,
197
197
                          "/dev/null", None, None,
198
198
                          output)
199
 
        self.assertEqual(output.getvalue(), "--- old_label\t\n"
200
 
                                            "+++ /dev/null\t\n"
 
199
        self.assertEqual(output.getvalue(), "--- old_label\n"
 
200
                                            "+++ /dev/null\n"
201
201
                                            "@@ -1,1 +0,0 @@\n"
202
202
                                            "-foo\n"
203
203
                                            "\n")
208
208
                          "new_label", self.tree_1,
209
209
                          "/dev/null", None, None,
210
210
                          output, reverse=True)
211
 
        self.assertEqual(output.getvalue(), "--- /dev/null\t\n"
212
 
                                            "+++ new_label\t\n"
 
211
        self.assertEqual(output.getvalue(), "--- /dev/null\n"
 
212
                                            "+++ new_label\n"
213
213
                                            "@@ -0,0 +1,1 @@\n"
214
214
                                            "+foo\n"
215
215
                                            "\n")
220
220
                          "/dev/null", self.tree_1, 
221
221
                          "new_label", self.file_2, self.tree_2,
222
222
                          output)
223
 
        self.assertEqual(output.getvalue(), "--- /dev/null\t\n"
224
 
                                            "+++ new_label\t\n"
 
223
        self.assertEqual(output.getvalue(), "--- /dev/null\n"
 
224
                                            "+++ new_label\n"
225
225
                                            "@@ -1,1 +1,1 @@\n"
226
226
                                            "-foo\n"
227
227
                                            "+bar\n"