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

  • Committer: v.ladeuil+lp at free
  • Date: 2006-10-12 14:29:32 UTC
  • mto: (2145.1.1 keepalive)
  • mto: This revision was merged to the branch mainline in revision 2146.
  • Revision ID: v.ladeuil+lp@free.fr-20061012142932-7221fe16d2b48fa3
Shuffle http related test code. Hopefully it ends up at the right place :)

* bzrlib/tests/HttpServer.py: 
New file. bzrlib.tests.ChrootedTestCase use HttpServer. So the
class can't be defined in bzrlib.tests.HTTPUtils because it
creates a circular dependency (bzrlib.tests.HTTPUtils needs to
import bzrlib.tests).

* bzrlib/transport/http/_urllib.py: 
Transfer test server definition to bzrlib.tests.HttpServer. Clean
up imports.

* bzrlib/transport/http/_pycurl.py: 
Transfer test server definition to bzrlib.tests.HttpServer. Clean
up imports.

* bzrlib/transport/http/__init__.py: 
Transfer all test related code to either bzrlib.tests.HttpServer
and bzrlib.tests.HTTPUtils.
Fix all use of TransportNotPossible and InvalidURL by prefixing it
by 'errors.' (this seems to be the preferred way in the rest of
bzr).
Get rid of unused imports.

* bzrlib/tests/test_transport.py:
(ReadonlyDecoratorTransportTest.test_local_parameters,
FakeNFSDecoratorTests.test_http_parameters): Use HttpServer from
bzrlib.tests.HttpServer instead of bzrlib.transport.http.

* bzrlib/tests/test_sftp_transport.py:
(set_test_transport_to_sftp): Use HttpServer from
bzrlib.tests.HttpServer instead of bzrlib.transport.http.

* bzrlib/tests/test_selftest.py:
(TestTestCaseWithTransport.test_get_readonly_url_http): Use
HttpServer from bzrlib.tests.HttpServer instead of
bzrlib.transport.http.

* bzrlib/tests/test_repository.py: 
Does *not* use HttpServer.

* bzrlib/tests/test_http.py: 
Build on top of bzrlib.tests.HttpServer and bzrlib.tests.HTTPUtils
instead of bzrlib.transport.http.

* bzrlib/tests/test_bzrdir.py:
(ChrootedTests.setUp): Use HttpServer from bzrlib.tests.HttpServer
instead of bzrlib.transport.http.

* bzrlib/tests/branch_implementations/test_http.py:
(HTTPBranchTests.setUp): Use HttpServer from bzrlib.tests.HttpServer
instead of bzrlib.transport.http.

* bzrlib/tests/branch_implementations/test_branch.py:
(ChrootedTests.setUp): Use HttpServer from bzrlib.tests.HttpServer
instead of bzrlib.transport.http.

* bzrlib/tests/__init__.py:
(ChrootedTestCase.setUp): Use HttpServer from
bzrlib.tests.HttpServer instead of bzrlib.transport.http.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/test_read_bundle.py
 
1
# Copyright (C) 2006 by Canonical Ltd
 
2
#
 
3
# This program is free software; you can redistribute it and/or modify
 
4
# it under the terms of the GNU General Public License as published by
 
5
# the Free Software Foundation; either version 2 of the License, or
 
6
# (at your option) any later version.
 
7
#
 
8
# This program is distributed in the hope that it will be useful,
 
9
# but WITHOUT ANY WARRANTY; without even the implied warranty of
 
10
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 
11
# GNU General Public License for more details.
 
12
#
 
13
# You should have received a copy of the GNU General Public License
 
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
 
16
 
 
17
"""Test read_bundle works properly across various transports."""
 
18
 
 
19
import cStringIO
 
20
import os
 
21
 
 
22
import bzrlib.bundle
 
23
from bzrlib.bundle.serializer import write_bundle
 
24
import bzrlib.bzrdir
 
25
import bzrlib.errors as errors
 
26
from bzrlib.tests import TestCaseInTempDir
 
27
from bzrlib.tests.test_transport import TestTransportImplementation
 
28
import bzrlib.transport
 
29
from bzrlib.transport.memory import MemoryTransport
 
30
import bzrlib.urlutils
 
31
 
 
32
 
 
33
class TestReadBundleFromURL(TestTransportImplementation):
 
34
    """Test that read_bundle works properly across multiple transports"""
 
35
 
 
36
    def get_url(self, relpath=''):
 
37
        return bzrlib.urlutils.join(self._server.get_url(), relpath)
 
38
 
 
39
    def create_test_bundle(self):
 
40
        # Can't use self.get_transport() because that asserts that 
 
41
        # it is not readonly, so just skip tests where the server is readonly
 
42
        self._transport = self.get_transport()
 
43
        #if isinstance(self._transport, MemoryTransport):
 
44
        #    return None
 
45
        self.build_tree(['tree/', 'tree/a', 'tree/subdir/'])
 
46
 
 
47
        format = bzrlib.bzrdir.BzrDirFormat.get_default_format()
 
48
 
 
49
 
 
50
        bzrdir = format.initialize('tree')
 
51
        repo = bzrdir.create_repository()
 
52
        branch = repo.bzrdir.create_branch()
 
53
        wt = branch.bzrdir.create_workingtree()
 
54
 
 
55
        wt.add(['a', 'subdir/'])
 
56
        wt.commit('new project', rev_id='commit-1')
 
57
 
 
58
        out = cStringIO.StringIO()
 
59
        rev_ids = write_bundle(wt.branch.repository,
 
60
                               wt.get_parent_ids()[0], None, out)
 
61
        out.seek(0)
 
62
        if self._transport.is_readonly():
 
63
            f = open('test_bundle', 'wb')
 
64
            f.write(out.getvalue())
 
65
            f.close()
 
66
        else:
 
67
            self._transport.put_file('test_bundle', out)
 
68
            self.log('Put to: %s', self.get_url('test_bundle'))
 
69
        return wt
 
70
 
 
71
    def test_read_bundle_from_url(self):
 
72
        wt = self.create_test_bundle()
 
73
        if wt is None:
 
74
            return
 
75
 
 
76
        info = bzrlib.bundle.read_bundle_from_url(
 
77
                    self.get_url('test_bundle'))
 
78
        bundle_tree = info.revision_tree(wt.branch.repository, info.target)
 
79
        self.assertEqual('commit-1', bundle_tree.revision_id)
 
80
 
 
81
    def test_read_fail(self):
 
82
        # Trying to read from a directory, or non-bundle file
 
83
        # should fail with NotABundle
 
84
        wt = self.create_test_bundle()
 
85
        if wt is None:
 
86
            return
 
87
 
 
88
        self.assertRaises(errors.NotABundle, 
 
89
            bzrlib.bundle.read_bundle_from_url, 
 
90
            self.get_url('tree'))
 
91
        self.assertRaises(errors.NotABundle, 
 
92
            bzrlib.bundle.read_bundle_from_url, 
 
93
            self.get_url('tree/a'))