Rev 6516: Put the script into a test method. 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: 6516
revision-id: v.ladeuil+lp at free.fr-20121109004345-3vx6zvempsgllpwn
parent: v.ladeuil+lp at free.fr-20121109003948-taxq4lx6vheb0k5z
committer: Vincent Ladeuil <v.ladeuil+lp at free.fr>
branch nick: 1072513-log-missing-revs
timestamp: Fri 2012-11-09 01:43:45 +0100
message:
  Put the script into a test method.
-------------- next part --------------
=== removed file 'bzrlib/tests/blackbox/log_bug_1072513.script'
--- a/bzrlib/tests/blackbox/log_bug_1072513.script	2012-11-09 00:39:48 +0000
+++ b/bzrlib/tests/blackbox/log_bug_1072513.script	1970-01-01 00:00:00 +0000
@@ -1,57 +0,0 @@
-$ bzr init-repo .
-# First, create a branch with a rev
-$ bzr init A
-$ cd A
-$ bzr ci --unchanged -m 'Init'
-# Now work on a file
-$ bzr branch ../A ../B
-$ cd ../B
-#
-#		if $mk_dir; then
-#			mkdir foo
-#			echo bar > foo/bar
-#		else
-$			echo > foo
-#		fi
-$ bzr add
-$ bzr ci -m 'Create foo'
-# Merge that
-$ cd ../A
-$ bzr merge ../B
-$ bzr ci -m "Merge B:1"
-#		if $mk_dir; then
-#			echo baz > foo/bar
-#		else
-$			echo baz > foo
-#		fi
-$ bzr ci --unchanged -m 'Edit file'
-# [1] [4.1]
-$ bzr ci --unchanged -m 'Nada'
-# Now make another branch from the start of A, and merge later stuff from A
-$ bzr branch -r1 ../A ../C
-$ cd ../C
-# [1]
-$ bzr ci --unchanged -m 'Nada'
-# [4]
-$ bzr merge ../A # -r4
-#$ bzr merge -r2 ../A
-#$ bzr merge -r3 ../A
-$ bzr ci -m 'Merge A:1'
-# [1]
-$ bzr ci --unchanged -m 'Nada'
-# [1]
-$ bzr ci --unchanged -m 'Nada'
-# [1]
-$ bzr ci --unchanged -m 'Nada'
-# Now land those changes back on A
-$ cd ../A
-# [1]
-$ bzr ci --unchanged -m 'Nada'
-$ bzr merge ../C
-$ bzr ci -m "Merge C:1"
-# [1]
-$ bzr ci --unchanged -m 'Nada'
-# Now see when foo was touched.
-$ cd ../A
-#$ bzr log -n0 foo
-$ bzr log -n0 -v foo

=== modified file 'bzrlib/tests/blackbox/test_log.py'
--- a/bzrlib/tests/blackbox/test_log.py	2011-12-21 14:50:43 +0000
+++ b/bzrlib/tests/blackbox/test_log.py	2012-11-09 00:43:45 +0000
@@ -28,8 +28,9 @@
     tests,
     )
 from bzrlib.tests import (
+    features,
+    script,
     test_log,
-    features,
     )
 from bzrlib.tests.matchers import ContainsNoVfsCalls
 
@@ -1131,3 +1132,68 @@
         self.assertLength(15, self.hpss_calls)
         self.assertLength(1, self.hpss_connections)
         self.assertThat(self.hpss_calls, ContainsNoVfsCalls)
+
+
+class TestBug10725113(script.TestCaseWithTransportAndScript):
+
+    def test_weird_log(self):
+        self.run_script('''
+$ bzr init-repo .
+# First, create a branch with a rev
+$ bzr init A
+$ cd A
+$ bzr ci --unchanged -m 'Init'
+# Now work on a file
+$ bzr branch ../A ../B
+$ cd ../B
+#
+#		if $mk_dir; then
+#			mkdir foo
+#			echo bar > foo/bar
+#		else
+$			echo > foo
+#		fi
+$ bzr add
+$ bzr ci -m 'Create foo'
+# Merge that
+$ cd ../A
+$ bzr merge ../B
+$ bzr ci -m "Merge B:1"
+#		if $mk_dir; then
+#			echo baz > foo/bar
+#		else
+$			echo baz > foo
+#		fi
+$ bzr ci --unchanged -m 'Edit file'
+# [1] [4.1]
+$ bzr ci --unchanged -m 'Nada'
+# Now make another branch from the start of A, and merge later stuff from A
+$ bzr branch -r1 ../A ../C
+$ cd ../C
+# [1]
+$ bzr ci --unchanged -m 'Nada'
+# [4]
+$ bzr merge ../A # -r4
+#$ bzr merge -r2 ../A
+#$ bzr merge -r3 ../A
+$ bzr ci -m 'Merge A:1'
+# [1]
+$ bzr ci --unchanged -m 'Nada'
+# [1]
+$ bzr ci --unchanged -m 'Nada'
+# [1]
+$ bzr ci --unchanged -m 'Nada'
+# Now land those changes back on A
+$ cd ../A
+# [1]
+$ bzr ci --unchanged -m 'Nada'
+$ bzr merge ../C
+$ bzr ci -m "Merge C:1"
+# [1]
+$ bzr ci --unchanged -m 'Nada'
+# Now see when foo was touched.
+$ cd ../A
+#$ bzr log -n0 foo
+$ bzr log -n0 -v foo
+''',
+                        null_output_matches_anything=True)

=== modified file 'bzrlib/tests/blackbox/test_merge.py'
--- a/bzrlib/tests/blackbox/test_merge.py	2012-01-05 13:02:31 +0000
+++ b/bzrlib/tests/blackbox/test_merge.py	2012-11-09 00:43:45 +0000
@@ -710,6 +710,7 @@
 
 
 class TestMergeScript(script.TestCaseWithTransportAndScript):
+
     def test_merge_empty_branch(self):
         source = self.make_branch_and_tree('source')
         self.build_tree(['source/a'])
@@ -721,6 +722,7 @@
 2>bzr: ERROR: Merging into empty branches not currently supported, https://bugs.launchpad.net/bzr/+bug/308562
 """)
 
+
 class TestMergeForce(tests.TestCaseWithTransport):
 
     def setUp(self):