Rev 4620: More failing tests. in file:///home/vila/src/bzr/experimental/conflict-manager/

[Vincent Ladeuil]

At file:///home/vila/src/bzr/experimental/conflict-manager/

------------------------------------------------------------
revno: 4620
revision-id: v.ladeuil+lp at free.fr-20091016131347-iq5r1y8p6r9fj9m1
parent: v.ladeuil+lp at free.fr-20091016130531-ephd6kxja5ic3bb0
committer: Vincent Ladeuil <v.ladeuil+lp at free.fr>
branch nick: description
timestamp: Fri 2009-10-16 15:13:47 +0200
message:
  More failing tests.
  
  * bzrlib/tests/blackbox/test_conflicts.py:
  (TestMixin): Renamed from TestBase, no need to contrain all
  daughter classes to inherit from TestCaseWithTransport.
  (TestResolve): Add a failing test for --interactive option.
-------------- next part --------------
=== modified file 'bzrlib/tests/blackbox/test_conflicts.py'
--- a/bzrlib/tests/blackbox/test_conflicts.py	2009-10-16 13:05:31 +0000
+++ b/bzrlib/tests/blackbox/test_conflicts.py	2009-10-16 13:13:47 +0000
@@ -25,7 +25,7 @@
 # FIXME: These don't really look at the output of the conflict commands, just
 # the number of lines - there should be more examination.
 
-class TestBase(tests.TestCaseWithTransport):
+class TestMixin(object):
 
     def make_tree_with_conflicts(self):
         a_tree = self.make_branch_and_tree('a')
@@ -55,7 +55,7 @@
         os.chdir('a')
 
 
-class TestConflicts(TestBase):
+class TestConflicts(tests.TestCaseWithTransport, TestMixin):
 
     def setUp(self):
         super(TestConflicts, self).setUp()
@@ -70,7 +70,7 @@
         self.assertEqual(['my_other_file', 'myfile'], conflicts)
 
 
-class TestResolve(TestBase):
+class TestResolve(tests.TestCaseWithTransport, TestMixin):
 
     def setUp(self):
         super(TestResolve, self).setUp()
@@ -120,3 +120,5 @@
         note = self.run_bzr('resolve')[1]
         self.assertContainsRe(note, 'All conflicts resolved.')
 
+    def test_resolve_interactive(self):
+        out, err = self.run_bzr('resolve --interactive mydir2', retcode=0)