/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 tests/test_cache.py

Don't modify dictionary during iteration.

Show diffs side-by-side

added added

removed removed

Lines of Context:
tests/test_cache.py
40
40
    TestCaseInTempDir,
41
41
    UnavailableFeature,
42
42
    )
 
43
from bzrlib.transport import (
 
44
    get_transport,
 
45
    )
43
46
 
44
 
from bzrlib.plugins.git.shamap import (
 
47
from bzrlib.plugins.git.cache import (
 
48
    DictBzrGitCache,
 
49
    IndexBzrGitCache,
 
50
    IndexGitCacheFormat,
45
51
    SqliteBzrGitCache,
46
 
    DictBzrGitCache,
47
52
    TdbBzrGitCache,
48
53
    )
49
54
 
65
70
        self.map.start_write_group()
66
71
        updater = self.cache.get_updater(Revision("myrevid"))
67
72
        c = self._get_test_commit()
68
 
        updater.add_object(c, None)
 
73
        updater.add_object(c, None, None)
69
74
        updater.finish()
70
75
        self.map.commit_write_group()
71
76
        self.assertEquals(
72
77
            ("commit", ("myrevid", "cc9462f7f8263ef5adfbeff2fb936bb36b504cba")),
73
78
            self.map.lookup_git_sha(c.id))
 
79
        self.assertEquals(c.id, self.map.lookup_commit("myrevid"))
74
80
 
75
81
    def test_lookup_notfound(self):
76
82
        self.assertRaises(KeyError,
79
85
    def test_blob(self):
80
86
        self.map.start_write_group()
81
87
        updater = self.cache.get_updater(Revision("myrevid"))
82
 
        updater.add_object(self._get_test_commit(), None)
 
88
        updater.add_object(self._get_test_commit(), None, None)
83
89
        b = Blob()
84
90
        b.data = "TEH BLOB"
85
91
        ie = InventoryFile("myfileid", "somename", ROOT_ID)
86
92
        ie.revision = "myrevid"
87
 
        updater.add_object(b, ie)
 
93
        updater.add_object(b, ie, None)
88
94
        updater.finish()
89
95
        self.map.commit_write_group()
90
96
        self.assertEquals(
96
102
    def test_tree(self):
97
103
        self.map.start_write_group()
98
104
        updater = self.cache.get_updater(Revision("myrevid"))
99
 
        updater.add_object(self._get_test_commit(), None)
 
105
        updater.add_object(self._get_test_commit(), None, None)
100
106
        t = Tree()
101
107
        t.add(stat.S_IFREG, "somename", Blob().id)
102
108
        ie = InventoryDirectory("fileid", "myname", ROOT_ID)
103
109
        ie.revision = "irrelevant"
104
 
        updater.add_object(t, ie)
 
110
        updater.add_object(t, ie, "")
105
111
        updater.finish()
106
112
        self.map.commit_write_group()
107
113
        self.assertEquals(("tree", ("fileid", "myrevid")),
108
114
            self.map.lookup_git_sha(t.id))
 
115
        # It's possible for a backend to not implement lookup_tree
 
116
        try:
 
117
            self.assertEquals(t.id,
 
118
                self.map.lookup_tree_id("fileid", "myrevid"))
 
119
        except NotImplementedError:
 
120
            pass
109
121
 
110
122
    def test_revids(self):
111
123
        self.map.start_write_group()
112
124
        updater = self.cache.get_updater(Revision("myrevid"))
113
125
        c = self._get_test_commit()
114
 
        updater.add_object(c, None)
 
126
        updater.add_object(c, None, None)
115
127
        updater.finish()
116
128
        self.map.commit_write_group()
117
129
        self.assertEquals(["myrevid"], list(self.map.revids()))
120
132
        self.map.start_write_group()
121
133
        updater = self.cache.get_updater(Revision("myrevid"))
122
134
        c = self._get_test_commit()
123
 
        updater.add_object(c, None)
 
135
        updater.add_object(c, None, None)
124
136
        updater.finish()
125
137
        self.map.commit_write_group()
126
138
        self.assertEquals(set(["lala", "bla"]),
152
164
        except ImportError:
153
165
            raise UnavailableFeature("Missing tdb")
154
166
        self.map = self.cache.idmap
 
167
 
 
168
 
 
169
class IndexGitShaMapTests(TestCaseInTempDir,TestGitShaMap):
 
170
 
 
171
    def setUp(self):
 
172
        TestCaseInTempDir.setUp(self)
 
173
        transport = get_transport(self.test_dir)
 
174
        IndexGitCacheFormat().initialize(transport)
 
175
        self.cache = IndexBzrGitCache(transport)
 
176
        self.map = self.cache.idmap