← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/tests/test_read_bundle.py

  • Committer: Robert Collins
  • Date: 2007-03-08 04:06:06 UTC
  • mfrom: (2323.1.1 integration)
  • mto: This revision was merged to the branch mainline in revision 2442.
  • Revision ID: robertc@robertcollins.net-20070308040606-84gsniv56huiyjt4
Merge bzr.dev.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/test_read_bundle.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
"""Test read_bundle works properly across various transports."""
18
18
 
23
23
from bzrlib.bundle.serializer import write_bundle
24
24
import bzrlib.bzrdir
25
25
import bzrlib.errors as errors
26
 
from bzrlib.symbol_versioning import deprecated_in
27
 
from bzrlib import tests
 
26
from bzrlib.tests import TestCaseInTempDir
28
27
from bzrlib.tests.test_transport import TestTransportImplementation
29
 
from bzrlib.tests.per_transport import transport_test_permutations
30
28
import bzrlib.transport
31
29
from bzrlib.transport.memory import MemoryTransport
32
30
import bzrlib.urlutils
33
31
 
34
32
 
35
 
def load_tests(standard_tests, module, loader):
36
 
    """Multiply tests for tranport implementations."""
37
 
    transport_tests, remaining_tests = tests.split_suite_by_condition(
38
 
        standard_tests,
39
 
        tests.condition_isinstance(TestReadMergeableBundleFromURL))
40
 
    return tests.multiply_tests(transport_tests, transport_test_permutations(),
41
 
        remaining_tests)
42
 
 
43
 
 
44
 
def create_bundle_file(test_case):
45
 
    test_case.build_tree(['tree/', 'tree/a', 'tree/subdir/'])
46
 
 
47
 
    format = bzrlib.bzrdir.BzrDirFormat.get_default_format()
48
 
 
49
 
    bzrdir = format.initialize('tree')
50
 
    repo = bzrdir.create_repository()
51
 
    branch = repo.bzrdir.create_branch()
52
 
    wt = branch.bzrdir.create_workingtree()
53
 
 
54
 
    wt.add(['a', 'subdir/'])
55
 
    wt.commit('new project', rev_id='commit-1')
56
 
 
57
 
    out = cStringIO.StringIO()
58
 
    rev_ids = write_bundle(wt.branch.repository,
59
 
                           wt.get_parent_ids()[0], 'null:', out)
60
 
    out.seek(0)
61
 
    return out, wt
62
 
 
63
 
 
64
 
class TestReadMergeableBundleFromURL(TestTransportImplementation):
 
33
class TestReadBundleFromURL(TestTransportImplementation):
65
34
    """Test that read_bundle works properly across multiple transports"""
66
35
 
67
 
    def setUp(self):
68
 
        super(TestReadMergeableBundleFromURL, self).setUp()
69
 
        self.bundle_name = 'test_bundle'
70
 
        # read_mergeable_from_url will invoke get_transport which may *not*
71
 
        # respect self._transport (i.e. returns a transport that is different
72
 
        # from the one we want to test, so we must inject a correct transport
73
 
        # into possible_transports first).
74
 
        self.possible_transports = [self.get_transport(self.bundle_name)]
75
 
        self._captureVar('BZR_NO_SMART_VFS', None)
76
 
        wt = self.create_test_bundle()
77
 
 
78
 
    def read_mergeable_from_url(self, url):
79
 
        return bzrlib.bundle.read_mergeable_from_url(
80
 
            url, possible_transports=self.possible_transports)
81
 
 
82
36
    def get_url(self, relpath=''):
83
37
        return bzrlib.urlutils.join(self._server.get_url(), relpath)
84
38
 
85
39
    def create_test_bundle(self):
86
 
        out, wt = create_bundle_file(self)
87
 
        if self.get_transport().is_readonly():
88
 
            self.build_tree_contents([(self.bundle_name, out.getvalue())])
 
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()
89
66
        else:
90
 
            self.get_transport().put_file(self.bundle_name, out)
91
 
            self.log('Put to: %s', self.get_url(self.bundle_name))
 
67
            self._transport.put_file('test_bundle', out)
 
68
            self.log('Put to: %s', self.get_url('test_bundle'))
92
69
        return wt
93
70
 
94
 
    def test_read_mergeable_from_url(self):
95
 
        info = self.read_mergeable_from_url(
96
 
            unicode(self.get_url(self.bundle_name)))
97
 
        revision = info.real_revisions[-1]
98
 
        self.assertEqual('commit-1', revision.revision_id)
 
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
                    unicode(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)
99
80
 
100
81
    def test_read_fail(self):
101
82
        # Trying to read from a directory, or non-bundle file
102
83
        # should fail with NotABundle
103
 
        self.assertRaises(errors.NotABundle,
104
 
                          self.read_mergeable_from_url, self.get_url('tree'))
105
 
        self.assertRaises(errors.NotABundle,
106
 
                          self.read_mergeable_from_url, self.get_url('tree/a'))
 
84
        wt = self.create_test_bundle()
 
85
        if wt is None:
 
86
            return
107
87
 
108
 
    def test_read_mergeable_respects_possible_transports(self):
109
 
        if not isinstance(self.get_transport(self.bundle_name),
110
 
                          bzrlib.transport.ConnectedTransport):
111
 
            # There is no point testing transport reuse for not connected
112
 
            # transports (the test will fail even).
113
 
            raise tests.TestSkipped(
114
 
                'Need a ConnectedTransport to test transport reuse')
115
 
        url = unicode(self.get_url(self.bundle_name))
116
 
        info = self.read_mergeable_from_url(url)
117
 
        self.assertEqual(1, len(self.possible_transports))
 
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'))