Rev 3882: Fixed as ber Robert's review. in file:///net/bigmamac/Volumes/home/vila/src/bzr/cases/3232-spurious-conflict/

[Vincent Ladeuil]

At file:///net/bigmamac/Volumes/home/vila/src/bzr/cases/3232-spurious-conflict/

------------------------------------------------------------
revno: 3882
revision-id: v.ladeuil+lp at free.fr-20081212120801-p1up3amo9ff3rghy
parent: v.ladeuil+lp at free.fr-20081211071228-21705lekcnoam79u
committer: Vincent Ladeuil <v.ladeuil+lp at free.fr>
branch nick: log-s-v
timestamp: Fri 2008-12-12 13:08:01 +0100
message:
  Fixed as ber Robert's review.
  
  * bzrlib/tests/blackbox/test_log.py:
  (TestLogVerbose): Refactor 'lob -v' delta format tests.
-------------- next part --------------
=== modified file 'bzrlib/tests/blackbox/test_log.py'
--- a/bzrlib/tests/blackbox/test_log.py	2008-12-11 07:12:28 +0000
+++ b/bzrlib/tests/blackbox/test_log.py	2008-12-12 12:08:01 +0000
@@ -219,35 +219,43 @@
         self.assertContainsRe(log, r'revno: 2\n')
         self.assertContainsRe(log, r'revno: 3\n')
 
-    def test_log_short_verbose(self):
-        self._prepare()
-        log = self.run_bzr(['log', '--short', '-v', '-r', '1'])[0]
-        # Check that we use the short status format and not the regular one
+
+class TestLogVerbose(TestCaseWithTransport):
+
+    def setUp(self):
+        super(TestLogVerbose, self).setUp()
+        tree = self.make_branch_and_tree('.')
+        self.build_tree(['hello.txt'])
+        tree.add('hello.txt')
+        tree.commit(message='message1')
+
+    def assertUseShortDeltaFormat(self, cmd):
+        log = self.run_bzr(cmd)[0]
+        # Check that we use the short status format
         self.assertContainsRe(log, '(?m)^A  hello.txt$')
         self.assertNotContainsRe(log, '(?m)^added:$')
 
+    def assertUseLongDeltaFormat(self, cmd):
+        log = self.run_bzr(cmd)[0]
+        # Check that we use the long status format
+        self.assertNotContainsRe(log, '(?m)^A  hello.txt$')
+        self.assertContainsRe(log, '(?m)^added:$')
+
+    def test_log_short_verbose(self):
+        self.assertUseShortDeltaFormat(['log', '--short', '-v'])
+
     def test_log_short_verbose_verbose(self):
-        self._prepare()
-        log = self.run_bzr(['log', '--short', '-vv', '-r', '1'])[0]
-        # Check that we use the long status format and not the short one
-        self.assertNotContainsRe(log, '(?m)^A  hello.txt$')
-        self.assertContainsRe(log, '(?m)^added:$')
+        self.assertUseLongDeltaFormat(['log', '--short', '-vv'])
 
     def test_log_long_verbose(self):
-        self._prepare()
-        log = self.run_bzr(['log', '--long', '-v', '-r', '1'])[0]
         # Check that we use the long status format, ignoring the verbosity
         # level
-        self.assertNotContainsRe(log, '(?m)^A  hello.txt$')
-        self.assertContainsRe(log, '(?m)^added:$')
+        self.assertUseLongDeltaFormat(['log', '--long', '-v'])
 
     def test_log_long_verbose_verbose(self):
-        self._prepare()
-        log = self.run_bzr(['log', '--long', '-vv', '-r', '1'])[0]
         # Check that we use the long status format, ignoring the verbosity
         # level
-        self.assertNotContainsRe(log, '(?m)^A  hello.txt$')
-        self.assertContainsRe(log, '(?m)^added:$')
+        self.assertUseLongDeltaFormat(['log', '--long', '-vv'])
 
 
 class TestLogMerges(TestCaseWithoutPropsHandler):