/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/test_subsume.py

  • Committer: Vincent Ladeuil
  • Date: 2007-06-06 14:26:08 UTC
  • mto: (2485.8.44 bzr.connection.sharing)
  • mto: This revision was merged to the branch mainline in revision 2646.
  • Revision ID: v.ladeuil+lp@free.fr-20070606142608-i9ufaqewadslf1cn
Finish sftp refactoring. Test suite passing.

* bzrlib/transport/sftp.py:
(clear_connection_cache): Deprecated.
(_sftp_connect, _sftp_connect_uncached): Deleted.
(SFTPTransport.__init__): Simplified.
(SFTPTransport._create_connection): New method. Copied from
_sftp_connect_uncached
(SFTPTransport._get_sftp): New method. Ensures that the connection
is established.
(SFTPTransport.clone): Deleted.
(SFTPTransport.has, SFTPTransport.get, SFTPTransport.readv,
SFTPTransport._put,
SFTPTransport._put_non_atomic_helper._open_and_write_file,
SFTPTransport._mkdir, SFTPTransport.append_file,
SFTPTransport.rename, SFTPTransport._rename_and_overwrite,
SFTPTransport.delete, SFTPTransport.rmdir, SFTPTransport.stat):
Use _get_sftp.

* bzrlib/tests/test_transport_implementations.py:
(TransportTests.test_connection_error): Simplified now that sftp
does not connection on construction.

* bzrlib/tests/test_sftp_transport.py:
(SFTPLockTests.test_sftp_locks): Delete test_multiple_connections.
(FakeSFTPTransport): Deleted.
(SFTPNonServerTest.test_parse_url_with_home_dir,
SFTPNonServerTest.test_relpath,
SSHVendorBadConnection.test_bad_connection_paramiko): Delete the
from_transport parameter as it's not needed anymore.
(SFTPLatencyKnob.test_latency_knob_slows_transport,
SFTPLatencyKnob.test_default): Force connection by issuing a
request.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/test_subsume.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., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
 
15
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
16
16
 
17
17
from bzrlib import bzrdir, errors, repository, workingtree, tests
18
18
 
22
22
    def make_branch_and_tree(self, relpath, format=None):
23
23
        if format is None:
24
24
            format = 'dirstate-with-subtree'
25
 
        return tests.TestCaseWithTransport.make_branch_and_tree(self, relpath,
 
25
        return tests.TestCaseWithTransport.make_branch_and_tree(self, relpath, 
26
26
                                                                format)
27
27
 
28
28
    def make_trees(self, format=None, same_root=False):
49
49
        """
50
50
        base_tree, sub_tree = self.make_trees(format='knit',
51
51
                                              same_root=True)
52
 
        self.assertRaises(errors.BadSubsumeSource, base_tree.subsume,
 
52
        self.assertRaises(errors.BadSubsumeSource, base_tree.subsume, 
53
53
                          sub_tree)
54
54
 
55
55
    def test_knit1_failure(self):
56
56
        base_tree, sub_tree = self.make_trees(format='knit')
57
 
        self.assertRaises(errors.SubsumeTargetNeedsUpgrade, base_tree.subsume,
 
57
        self.assertRaises(errors.SubsumeTargetNeedsUpgrade, base_tree.subsume, 
58
58
                          sub_tree)
59
59
 
60
60
    def test_subsume_tree(self):
61
61
        base_tree, sub_tree = self.make_trees()
62
 
        self.assertNotEqual(base_tree.get_root_id(), sub_tree.get_root_id())
 
62
        assert base_tree.get_root_id() != sub_tree.get_root_id()
63
63
        sub_root_id = sub_tree.get_root_id()
64
64
        # this test checks the subdir is removed, so it needs to know the
65
65
        # control directory; that changes rarely so just hardcode (and check)
100
100
        if base_tree.get_root_id() == sub_tree.get_root_id():
101
101
            raise tests.TestSkipped('This test requires unique roots')
102
102
        sub_root_id = sub_tree.get_root_id()
103
 
        self.assertRaises(errors.BadSubsumeSource, base_tree.subsume,
 
103
        self.assertRaises(errors.BadSubsumeSource, base_tree.subsume, 
104
104
                          base_tree)
105
 
        self.assertRaises(errors.BadSubsumeSource, sub_tree.subsume,
 
105
        self.assertRaises(errors.BadSubsumeSource, sub_tree.subsume, 
106
106
                          base_tree)
107
107
        self.build_tree(['subtree2/'])
108
108
        sub_tree2 = self.make_branch_and_tree('subtree2')
109
 
        self.assertRaises(errors.BadSubsumeSource, sub_tree.subsume,
 
109
        self.assertRaises(errors.BadSubsumeSource, sub_tree.subsume, 
110
110
                          sub_tree2)
111
111
        self.build_tree(['tree/subtree/subtree3/'])
112
112
        sub_tree3 = self.make_branch_and_tree('tree/subtree/subtree3')