← Back to branch summary

~ubuntu-branches/debian/jessie/bzr-git/jessie

« back to all changes in this revision

Viewing changes to tests/test_push.py

  • Committer: Package Import Robot
  • Author(s): Jelmer Vernooij
  • Date: 2011-12-15 19:06:37 UTC
  • mfrom: (1.1.25)
  • Revision ID: package-import@ubuntu.com-20111215190637-cd1n2iathdjg1u97
Tags: 0.6.6-1
http://bugs.debian.org/652178
https://launchpad.net/bugs/903639
https://launchpad.net/bugs/894195
* Use DEP5 format for copyright file.
* New upstream release.
 + Copes with new `possible_transports` argument for Branch.open added in
   bzr 2.5b4. Closes: #652178
 + Copes with removal of global options in bzr 2.5b4. LP: #903639
 + Fixes support for directories in `bzr add`. LP: #894195

Show diffs side-by-side

added added

removed removed

Lines of Context:
tests/test_push.py
38
38
        super(InterToGitRepositoryTests, self).setUp()
39
39
        self.git_repo = self.make_repository("git",
40
40
                format=format_registry.make_bzrdir("git"))
41
 
        self.bzr_repo = self.make_repository("bzr")
 
41
        self.bzr_repo = self.make_repository("bzr", shared=True)
 
42
 
 
43
    def _get_interrepo(self):
42
44
        self.bzr_repo.lock_read()
43
45
        self.addCleanup(self.bzr_repo.unlock)
44
 
        self.interrepo = InterRepository.get(self.bzr_repo, self.git_repo)
 
46
        return InterRepository.get(self.bzr_repo, self.git_repo)
45
47
 
46
48
    def test_instance(self):
47
 
        self.assertIsInstance(self.interrepo, InterToGitRepository)
 
49
        self.assertIsInstance(self._get_interrepo(), InterToGitRepository)
48
50
 
49
51
    def test_pointless_fetch_refs(self):
50
 
        revidmap, old_refs, new_refs = self.interrepo.fetch_refs(lambda x: {}, lossy=False)
 
52
        revidmap, old_refs, new_refs = self._get_interrepo().fetch_refs(lambda x: {}, lossy=False)
51
53
        self.assertEquals(old_refs, {'HEAD': ('ref: refs/heads/master', None)})
52
54
        self.assertEquals(new_refs, {})
53
55
 
54
56
    def test_pointless_lossy_fetch_refs(self):
55
 
        revidmap, old_refs, new_refs = self.interrepo.fetch_refs(lambda x: {}, lossy=True)
 
57
        revidmap, old_refs, new_refs = self._get_interrepo().fetch_refs(lambda x: {}, lossy=True)
56
58
        self.assertEquals(old_refs, {'HEAD': ('ref: refs/heads/master', None)})
57
59
        self.assertEquals(new_refs, {})
58
60
        self.assertEquals(revidmap, {})
59
61
 
60
62
    def test_pointless_missing_revisions(self):
61
 
        self.interrepo.source_store.lock_read()
62
 
        self.addCleanup(self.interrepo.source_store.unlock)
63
 
        self.assertEquals([], list(self.interrepo.missing_revisions([])))
 
63
        interrepo = self._get_interrepo()
 
64
        interrepo.source_store.lock_read()
 
65
        self.addCleanup(interrepo.source_store.unlock)
 
66
        self.assertEquals([], list(interrepo.missing_revisions([])))
64
67
 
65
68
    def test_missing_revisions_unknown_stop_rev(self):
66
 
        self.interrepo.source_store.lock_read()
67
 
        self.addCleanup(self.interrepo.source_store.unlock)
 
69
        interrepo = self._get_interrepo()
 
70
        interrepo.source_store.lock_read()
 
71
        self.addCleanup(interrepo.source_store.unlock)
68
72
        self.assertEquals([],
69
 
                list(self.interrepo.missing_revisions([(None, "unknown")])))
 
73
                list(interrepo.missing_revisions([(None, "unknown")])))
 
74
 
 
75
    def test_odd_rename(self):
 
76
        # Add initial revision to bzr branch.
 
77
        branch = self.bzr_repo.bzrdir.create_branch()
 
78
        tree = branch.bzrdir.create_workingtree()
 
79
        self.build_tree(["bzr/bar/", "bzr/bar/foobar"])
 
80
        tree.add(["bar", "bar/foobar"])
 
81
        tree.commit("initial")
 
82
 
 
83
        # Add new directory and perform move in bzr branch.
 
84
        self.build_tree(["bzr/baz/"])
 
85
        tree.add(["baz"])
 
86
        tree.rename_one("bar", "baz/IrcDotNet")
 
87
        last_revid = tree.commit("rename")
 
88
 
 
89
        # Push bzr branch to git branch.
 
90
        def decide(x):
 
91
            return { "refs/heads/master": (None, last_revid) }
 
92
        interrepo = self._get_interrepo()
 
93
        revidmap, old_refs, new_refs = interrepo.fetch_refs(decide, lossy=True)
 
94
        gitid = revidmap[last_revid][0]
 
95
        store = self.git_repo._git.object_store
 
96
        commit = store[gitid]
 
97
        tree = store[commit.tree]
 
98
        tree.check()
 
99
        self.expectFailure("fails with KeyError (bug 818318)",
 
100
            self.assertTrue, tree["baz"][1] in store)
 
101
        baz = store[tree["baz"][1]]
 
102
        baz.check()
 
103
        ircdotnet = store[baz["IrcDotNet"][1]]
 
104
        ircdotnet.check()
 
105
        foobar = store[ircdotnet["foobar"][1]]
 
106
        foobar.check()