← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

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

  • Committer: Martin Pool
  • Date: 2010-02-25 06:17:27 UTC
  • mfrom: (5055 +trunk)
  • mto: This revision was merged to the branch mainline in revision 5057.
  • Revision ID: mbp@sourcefrog.net-20100225061727-4sd9lt0qmdc6087t
merge news

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/per_branch/test_http.py
1
 
# Copyright (C) 2006 Canonical Ltd
 
1
# Copyright (C) 2006-2010 Canonical Ltd
2
2
#
3
3
# This program is free software; you can redistribute it and/or modify
4
4
# it under the terms of the GNU General Public License as published by
20
20
    branch,
21
21
    errors,
22
22
    )
23
 
from bzrlib.tests import per_branch
24
 
from bzrlib.transport import (
25
 
    chroot,
26
 
    local,
 
23
from bzrlib.tests import (
 
24
    per_branch,
 
25
    test_server,
27
26
    )
28
27
 
29
28
 
38
37
 
39
38
    def setUp(self):
40
39
        super(InaccessibleParentTests, self).setUp()
41
 
        if self.transport_server in (local.LocalURLServer, None):
42
 
            self.transport_readonly_server = chroot.TestingChrootServer
 
40
        if self.transport_server in (test_server.LocalURLServer, None):
 
41
            self.transport_readonly_server = test_server.TestingChrootServer
43
42
 
44
43
    def get_branch_with_invalid_parent(self):
45
44
        """Get a branch whose get_parent will raise InaccessibleParent."""