Rev 4471: Use mixins as suggested by Martin on IRC. in file:///home/vila/src/bzr/bugs/206577-send-strict/

[Vincent Ladeuil]

At file:///home/vila/src/bzr/bugs/206577-send-strict/

------------------------------------------------------------
revno: 4471
revision-id: v.ladeuil+lp at free.fr-20090629095035-oeejy5pfebrpby66
parent: v.ladeuil+lp at free.fr-20090629094716-lwjbd7qvzlj2kqgf
committer: Vincent Ladeuil <v.ladeuil+lp at free.fr>
branch nick: 206577-send-strict
timestamp: Mon 2009-06-29 11:50:35 +0200
message:
  Use mixins as suggested by Martin on IRC.
  
  * bzrlib/tests/blackbox/test_send.py:
  Using mixins is indeed clearer.
-------------- next part --------------
=== modified file 'bzrlib/tests/blackbox/test_send.py'
--- a/bzrlib/tests/blackbox/test_send.py	2009-06-29 09:47:16 +0000
+++ b/bzrlib/tests/blackbox/test_send.py	2009-06-29 09:50:35 +0000
@@ -50,7 +50,7 @@
     return result
 
 
-class TestSendBase(tests.TestCaseWithTransport):
+class TestSendMixin(object):
 
     _default_command = ['send', '-o-']
     _default_wd = 'branch'
@@ -73,7 +73,7 @@
         self.assertEqual(set(revs), set(r.revision_id for r in br.revisions))
 
 
-class TestSend(TestSendBase):
+class TestSend(tests.TestCaseWithTransport, TestSendMixin):
 
     def setUp(self):
         super(TestSend, self).setUp()
@@ -287,7 +287,7 @@
         self.assertEqual(err, 'bzr: ERROR: Not a branch: "%s".\n' % location)
 
 
-class TestSendStrict(TestSendBase):
+class TestSendStrictMixin(TestSendMixin):
 
     _default_command = ['send', '-o-', '../parent']
     _default_wd = 'local'
@@ -325,7 +325,8 @@
         self.assertEqual(set(revs), set(r.revision_id for r in br.revisions))
 
 
-class TestSendStrictWithoutChanges(TestSendStrict):
+class TestSendStrictWithoutChanges(tests.TestCaseWithTransport,
+                                   TestSendStrictMixin):
 
     def setUp(self):
         super(TestSendStrictWithoutChanges, self).setUp()
@@ -349,7 +350,8 @@
         self.assertSendSucceeds(['local'], [])
 
 
-class TestSendStrictWithChanges(TestSendStrict):
+class TestSendStrictWithChanges(tests.TestCaseWithTransport,
+                                   TestSendStrictMixin):
 
     _changes_type = None # Set by load_tests