Rev 6518: Make the tests fail with the output expected in the bug report. in file:///home/vila/src/bzr/bugs/1072513-log-missing-revs/

[Vincent Ladeuil]

At file:///home/vila/src/bzr/bugs/1072513-log-missing-revs/

------------------------------------------------------------
revno: 6518
revision-id: v.ladeuil+lp at free.fr-20121109005351-2e05wzhqpx1e17n2
parent: v.ladeuil+lp at free.fr-20121109004753-wlw1yu684qupyx8j
committer: Vincent Ladeuil <v.ladeuil+lp at free.fr>
branch nick: 1072513-log-missing-revs
timestamp: Fri 2012-11-09 01:53:51 +0100
message:
  Make the tests fail with the output expected in the bug report.
-------------- next part --------------
=== modified file 'bzrlib/tests/blackbox/test_log.py'
--- a/bzrlib/tests/blackbox/test_log.py	2012-11-09 00:47:53 +0000
+++ b/bzrlib/tests/blackbox/test_log.py	2012-11-09 00:53:51 +0000
@@ -1136,7 +1136,8 @@
 
 class TestBug10725113(script.TestCaseWithTransportAndScript):
 
-    def test_weird_log(self):
+    def setUp(self):
+        super(TestBug10725113, self).setUp()
         self.run_script('''
 $ bzr init-repo .
 # First, create a branch with a rev
@@ -1193,10 +1194,25 @@
 $ bzr ci --unchanged -m 'Nada'
 ''',
                         null_output_matches_anything=True)
-        self.run_script('''
-# Now see when foo was touched.
-$ cd ../A
-#$ bzr log -n0 foo
-$ bzr log -n0 -v --line foo
-  1.2.2: ... [merge] Merge A:1
+
+    def test_log_foo(self):
+        self.run_script('''
+# Now see when foo was touched.
+$ cd ../A
+$ bzr log --line -n0 foo
+  1.2.2: ... [merge] Merge A:1
+3: jrandom at example.com 2012-11-09 Edit file
+2: jrandom at example.com 2012-11-09 [merge] Merge B:1
+  1.1.1: jrandom at example.com 2012-11-09 Create foo
+''')
+
+    def test_log_v_foo(self):
+        self.run_script('''
+# Now see when foo was touched.
+$ cd ../A
+$ bzr log --line -n0 -v foo
+  1.2.2: ... [merge] Merge A:1
+3: jrandom at example.com 2012-11-09 Edit file
+2: jrandom at example.com 2012-11-09 [merge] Merge B:1
+  1.1.1: jrandom at example.com 2012-11-09 Create foo
 ''')