← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/tests/test_remote.py

  • Committer: Jelmer Vernooij
  • Date: 2011-01-13 01:32:26 UTC
  • mfrom: (5606 +trunk)
  • mto: This revision was merged to the branch mainline in revision 5607.
  • Revision ID: jelmer@samba.org-20110113013226-1d41bwtmps9y68wm
Merge bzr.dev.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/test_remote.py
1
 
# Copyright (C) 2006-2010 Canonical Ltd
 
1
# Copyright (C) 2006-2011 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
61
61
from bzrlib.smart.client import _SmartClient
62
62
from bzrlib.smart.repository import SmartServerRepositoryGetParentMap
63
63
from bzrlib.tests import (
64
 
    condition_isinstance,
65
 
    multiply_tests,
66
64
    test_server,
67
65
    )
68
66
from bzrlib.tests.scenarios import load_tests_apply_scenarios
71
69
    RemoteTransport,
72
70
    RemoteSSHTransport,
73
71
    RemoteTCPTransport,
74
 
)
 
72
    )
75
73
 
76
74
 
77
75
load_tests = load_tests_apply_scenarios