Rev 3887: Delete useless tests. 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: 3887
revision-id: v.ladeuil+lp at free.fr-20081211112546-z3mkqn46dljpe95v
parent: v.ladeuil+lp at free.fr-20081211111604-zkximgov93rd8foq
committer: Vincent Ladeuil <v.ladeuil+lp at free.fr>
branch nick: log-deep
timestamp: Thu 2008-12-11 12:25:46 +0100
message:
  Delete useless tests.
  
  * bzrlib/tests/blackbox/test_log.py:
  (TestLogFileDeep): --long doesn't obey the verbosity level anymore.
-------------- next part --------------
=== modified file 'bzrlib/tests/blackbox/test_log.py'
--- a/bzrlib/tests/blackbox/test_log.py	2008-12-11 11:16:04 +0000
+++ b/bzrlib/tests/blackbox/test_log.py	2008-12-11 11:25:46 +0000
@@ -564,25 +564,12 @@
         self.addCleanup(os.chdir, '..')
         self.tree = wt
 
-    def test_log_file_not_deep_long(self):
-        log = self.run_bzr(['log', '-v', '--long',  'f2'])[0]
-        self.assertNotContainsRe(log, 'revno: 1\n')
-        self.assertContainsRe(log, '(?sm)revno: 3\n.*A  f2\n')
-
     def test_log_file_not_deep_short(self):
         log = self.run_bzr(['log', '-v', '--short',  'f2'])[0]
         self.assertNotContainsRe(log, 'A  f1\n')
         self.assertNotContainsRe(log, '  f1\n')
         self.assertContainsRe(log,  '  f2\n')
 
-    def test_log_file_deep_long(self):
-        log = self.run_bzr(['log', '-v', '--deep', '--long',  'f2'])[0]
-        # revnos 1 and 3 appear and mention adding f2
-        self.assertContainsRe(log, '(?sm)revno: 1\n.*A  f2\n')
-        self.assertContainsRe(log, '(?sm)revno: 3\n.*A  f2\n')
-        # revno 2 appears and mentions deleting f2
-        self.assertContainsRe(log, '(?sm)revno: 2\n.*D  f2\n')
-
     def test_log_file_not_deep_short(self):
         log = self.run_bzr(['log', '-v', '--deep', '--short',  'f2'])[0]
         # revnos 1 and 3 appear and mention adding f2