~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/tests/per_branch/test_push.py

  • Committer: Vincent Ladeuil
  • Date: 2010-06-18 15:36:27 UTC
  • mto: (5247.4.16 sftp-leaks)
  • mto: This revision was merged to the branch mainline in revision 5396.
  • Revision ID: v.ladeuil+lp@free.fr-20100618153627-2ceniy5w6f3zsmhw
Fix the last remaining failures.

* bzrlib/tests/test_server.py:
(TestingSmartServer.serve): Run the hooks.
(SmartTCPServer_for_testing.stop_server): Don't forget the chroot
server.

* bzrlib/tests/per_branch/test_push.py:
(EmptyPushSmartEffortTests.setUp): Fix the issubclass check, the
smart test server don't ihnerit directly from
server.SmartTCPServer anymore.

Show diffs side-by-side

added added

removed removed

Lines of Context:
382
382
 
383
383
    def setUp(self):
384
384
        # Skip some scenarios that don't apply to these tests.
385
 
        if (self.transport_server is not None and
386
 
            issubclass(self.transport_server, server.SmartTCPServer)):
 
385
        if (self.transport_server is not None
 
386
            and issubclass(self.transport_server,
 
387
                           test_server.SmartTCPServer_for_testing)):
387
388
            raise tests.TestNotApplicable(
388
389
                'Does not apply when remote backing branch is also '
389
390
                'a smart branch')