/brz/remove-bazaar

To get this branch, use:
bzr branch http://gegoxaren.bato24.eu/bzr/brz/remove-bazaar

« back to all changes in this revision

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

  • Committer: Andrew Bennetts
  • Date: 2010-01-12 03:53:21 UTC
  • mfrom: (4948 +trunk)
  • mto: This revision was merged to the branch mainline in revision 4964.
  • Revision ID: andrew.bennetts@canonical.com-20100112035321-hofpz5p10224ryj3
Merge lp:bzr, resolving conflicts.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/per_branch/test_http.py
12
12
#
13
13
# You should have received a copy of the GNU General Public License
14
14
# along with this program; if not, write to the Free Software
15
 
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 
15
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
16
16
 
17
17
"""Test branches with inaccessible parents."""
18
18
 
19
19
import os
20
20
 
21
21
from bzrlib import branch, errors
22
 
from bzrlib.tests.branch_implementations.test_branch import TestCaseWithBranch
23
22
from bzrlib.tests.http_server import HttpServer
 
23
from bzrlib.tests.per_branch.test_branch import TestCaseWithBranch
24
24
from bzrlib.transport.local import LocalURLServer
25
25
from bzrlib.transport.chroot import TestingChrootServer
26
26
 
27
27
 
28
28
class InaccessibleParentTests(TestCaseWithBranch):
29
29
    """Tests with branches with "inaccessible" parents.
30
 
    
 
30
 
31
31
    An "inaccessible" parent location is one that cannot be represented, e.g. if
32
32
    a child branch says its parent is at "../../my-parent", but that child is at
33
33
    "http://host/one" then that parent location is inaccessible.  These