← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/tests/test_smart.py

  • Committer: Jelmer Vernooij
  • Date: 2012-04-16 11:08:11 UTC
  • mfrom: (6521 +trunk)
  • mto: This revision was merged to the branch mainline in revision 6522.
  • Revision ID: jelmer@samba.org-20120416110811-0y996ihqy9o2bb1t
Merge bzr.dev.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/test_smart.py
1
 
# Copyright (C) 2006-2011 Canonical Ltd
 
1
# Copyright (C) 2006-2012 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
30
30
from bzrlib import (
31
31
    bencode,
32
32
    branch as _mod_branch,
33
 
    bzrdir,
 
33
    controldir,
34
34
    errors,
35
35
    gpg,
36
36
    inventory_delta,
121
121
        stream = [('text', [versionedfile.FulltextContentFactory(('k1',), None,
122
122
            None, 'foo')]),('text', [
123
123
            versionedfile.FulltextContentFactory(('k2',), None, None, 'bar')])]
124
 
        fmt = bzrdir.format_registry.get('pack-0.92')().repository_format
 
124
        fmt = controldir.format_registry.get('pack-0.92')().repository_format
125
125
        bytes = smart_repo._stream_to_byte_stream(stream, fmt)
126
126
        streams = []
127
127
        # Iterate the resulting iterable; checking that we get only one stream
333
333
        self.make_bzrdir('.')
334
334
        request_class = smart_dir.SmartServerRequestCreateRepository
335
335
        request = request_class(backing)
336
 
        reference_bzrdir_format = bzrdir.format_registry.get('pack-0.92')()
 
336
        reference_bzrdir_format = controldir.format_registry.get('pack-0.92')()
337
337
        reference_format = reference_bzrdir_format.repository_format
338
338
        network_name = reference_format.network_name()
339
339
        expected = smart_req.SuccessfulSmartServerResponse(
419
419
        backing = self.get_transport()
420
420
        request = self._request_class(backing)
421
421
        result = self._make_repository_and_result(
422
 
            format='dirstate-with-subtree')
 
422
            format='development-subtree')
423
423
        # check the test will be valid
424
424
        self.assertEqual('yes', result.args[2])
425
425
        self.assertEqual('yes', result.args[3])
430
430
        backing = self.get_transport()
431
431
        request = self._request_class(backing)
432
432
        result = self._make_repository_and_result(
433
 
            format='dirstate-with-subtree')
 
433
            format='development-subtree')
434
434
        # check the test will be valid
435
 
        self.assertEqual('no', result.args[4])
 
435
        self.assertEqual('yes', result.args[4])
436
436
        self.assertEqual(result, request.execute(''))
437
437
 
438
438
 
493
493
        request = smart_dir.SmartServerRequestInitializeBzrDir(backing)
494
494
        self.assertEqual(smart_req.SmartServerResponse(('ok', )),
495
495
            request.execute(''))
496
 
        made_dir = bzrdir.BzrDir.open_from_transport(backing)
 
496
        made_dir = controldir.ControlDir.open_from_transport(backing)
497
497
        # no branch, tree or repository is expected with the current
498
498
        # default formart.
499
499
        self.assertRaises(errors.NoWorkingTree, made_dir.open_workingtree)
533
533
                                           'False', '', '', '')),
534
534
            request.execute(name, '', 'True', 'False', 'False', '', '', '', '',
535
535
                            'False'))
536
 
        made_dir = bzrdir.BzrDir.open_from_transport(backing)
 
536
        made_dir = controldir.ControlDir.open_from_transport(backing)
537
537
        # no branch, tree or repository is expected with the current
538
538
        # default format.
539
539
        self.assertRaises(errors.NoWorkingTree, made_dir.open_workingtree)
1323
1323
        finally:
1324
1324
            branch.unlock()
1325
1325
        self.assertEqual(smart_req.SuccessfulSmartServerResponse(()), response)
 
1326
        # Refresh branch as SetParentLocation modified it
 
1327
        branch = branch.bzrdir.open_branch()
1326
1328
        self.assertEqual(None, branch.get_parent())
1327
1329
 
1328
1330
    def test_set_parent_something(self):
1332
1334
        branch_token, repo_token = self.get_lock_tokens(branch)
1333
1335
        try:
1334
1336
            response = request.execute('base', branch_token, repo_token,
1335
 
            'http://bar/')
 
1337
                                       'http://bar/')
1336
1338
        finally:
1337
1339
            branch.unlock()
1338
1340
        self.assertEqual(smart_req.SuccessfulSmartServerResponse(()), response)
1339
 
        self.assertEqual('http://bar/', branch.get_parent())
 
1341
        refreshed = _mod_branch.Branch.open(branch.base)
 
1342
        self.assertEqual('http://bar/', refreshed.get_parent())
1340
1343
 
1341
1344
 
1342
1345
class TestSmartServerBranchRequestGetTagsBytes(
2666
2669
class TestSmartServerRepositoryGetInventories(tests.TestCaseWithTransport):
2667
2670
 
2668
2671
    def _get_serialized_inventory_delta(self, repository, base_revid, revid):
2669
 
        base_inv = repository.revision_tree(base_revid).inventory
2670
 
        inv = repository.revision_tree(revid).inventory
 
2672
        base_inv = repository.revision_tree(base_revid).root_inventory
 
2673
        inv = repository.revision_tree(revid).root_inventory
2671
2674
        inv_delta = inv._make_delta(base_inv)
2672
2675
        serializer = inventory_delta.InventoryDeltaSerializer(True, False)
2673
2676
        return "".join(serializer.delta_to_lines(base_revid, revid, inv_delta))
2688
2691
            versionedfile.FulltextContentFactory('somerev', None, None,
2689
2692
                self._get_serialized_inventory_delta(
2690
2693
                    t.branch.repository, 'null:', 'somerev'))])]
2691
 
        fmt = bzrdir.format_registry.get('2a')().repository_format
 
2694
        fmt = controldir.format_registry.get('2a')().repository_format
2692
2695
        self.assertEquals(
2693
2696
            "".join(response.body_stream),
2694
2697
            "".join(smart_repo._stream_to_byte_stream(stream, fmt)))