← Back to branch summary

~jelmer/bzr-git/lp-pqm

« back to all changes in this revision

Viewing changes to tests/test_blackbox.py

  • Committer: Launchpad Patch Queue Manager
  • Date: 2012-02-01 22:14:20 UTC
  • mfrom: (274.1.1 lp-pqm)
  • Revision ID: launchpad@pqm.canonical.com-20120201221420-kl7inqti3diozoli
[rs=jelmer] Update to r1567

Show diffs side-by-side

added added

removed removed

Lines of Context:
tests/test_blackbox.py
49
49
        return repo, builder.finish()[r1]
50
50
 
51
51
    def test_nick(self):
52
 
        GitRepo.init(self.test_dir)
 
52
        r = GitRepo.init(self.test_dir)
 
53
        del r["HEAD"]
53
54
        dir = BzrDir.open(self.test_dir)
54
55
        dir.create_branch()
55
56
        output, error = self.run_bzr(['nick'])
56
 
        self.assertEquals("master\n", output)
 
57
        self.assertEquals("HEAD\n", output)
57
58
 
58
59
    def test_info(self):
59
60
        self.simple_commit()
103
104
    def test_info_verbose(self):
104
105
        self.simple_commit()
105
106
 
106
 
        if bzrlib_version < (2, 4):
107
 
            self.knownFailure("bzr info uses inventory on bzr < 2.4")
108
 
 
109
107
        output, error = self.run_bzr(['info', '-v'])
110
108
        self.assertEqual(error, '')
111
109
        self.assertTrue("Standalone tree (format: git)" in output)
188
186
        r.do_commit(ref="refs/heads/abranch", committer="Joe <joe@example.com>", message="Dummy")
189
187
        r.do_commit(ref="refs/heads/bbranch", committer="Joe <joe@example.com>", message="Dummy")
190
188
        self.run_bzr(["git-import", "a", "b"])
191
 
        self.assertEquals(set(["abranch", "bbranch", ".bzr"]),
192
 
                set(os.listdir("b")))
 
189
        self.assertEquals(set([".bzr"]), set(os.listdir("b")))
 
190
        self.assertEquals(set(["abranch", "bbranch"]),
 
191
                set(BzrDir.open("b").get_branches().keys()))
193
192
 
194
193
    def test_git_import_incremental(self):
195
194
        r = GitRepo.init("a", mkdir=True)
198
197
        r.do_commit(ref="refs/heads/abranch", committer="Joe <joe@example.com>", message="Dummy")
199
198
        self.run_bzr(["git-import", "a", "b"])
200
199
        self.run_bzr(["git-import", "a", "b"])
201
 
        self.assertEquals(set(["abranch", ".bzr"]), set(os.listdir("b")))
 
200
        self.assertEquals(set([".bzr"]), set(os.listdir("b")))
 
201
        b = BzrDir.open("b")
 
202
        self.assertEquals(["abranch"], b.get_branches().keys())
202
203
 
203
204
    def test_git_import_tags(self):
204
205
        r = GitRepo.init("a", mkdir=True)
207
208
        cid = r.do_commit(ref="refs/heads/abranch", committer="Joe <joe@example.com>", message="Dummy")
208
209
        r["refs/tags/atag"] = cid
209
210
        self.run_bzr(["git-import", "a", "b"])
210
 
        self.assertEquals(set(["abranch", ".bzr"]), set(os.listdir("b")))
211
 
        b = Branch.open("b/abranch")
212
 
        self.assertEquals(["atag"], b.tags.get_tag_dict().keys())
 
211
        self.assertEquals(set([".bzr"]), set(os.listdir("b")))
 
212
        b = BzrDir.open("b")
 
213
        self.assertEquals(["abranch"], b.get_branches().keys())
 
214
        self.assertEquals(["atag"],
 
215
                b.open_branch("abranch").tags.get_tag_dict().keys())
213
216
 
214
217
    def test_git_import_colo(self):
215
218
        if bzrlib_version < (2, 5, 0):
224
227
        self.assertEquals(
225
228
            set([b.name for b in BzrDir.open("b").list_branches()]),
226
229
            set(["abranch", "bbranch"]))
 
230
 
 
231
    def test_git_refs_from_git(self):
 
232
        r = GitRepo.init("a", mkdir=True)
 
233
        self.build_tree(["a/file"])
 
234
        r.stage("file")
 
235
        cid = r.do_commit(ref="refs/heads/abranch", committer="Joe <joe@example.com>", message="Dummy")
 
236
        r["refs/tags/atag"] = cid
 
237
        (stdout, stderr) = self.run_bzr(["git-refs", "a"])
 
238
        self.assertEquals(stderr, "")
 
239
        self.assertEquals(stdout,
 
240
            'refs/tags/atag -> ' + cid + '\n'
 
241
            'refs/heads/abranch -> ' + cid + '\n')
 
242
 
 
243
    def test_git_refs_from_bzr(self):
 
244
        tree = self.make_branch_and_tree('a')
 
245
        self.build_tree(["a/file"])
 
246
        tree.add(["file"])
 
247
        revid = tree.commit(committer="Joe <joe@example.com>", message="Dummy")
 
248
        tree.branch.tags.set_tag("atag", revid)
 
249
        (stdout, stderr) = self.run_bzr(["git-refs", "a"])
 
250
        self.assertEquals(stderr, "")
 
251
        self.assertTrue("refs/tags/atag -> " in stdout)
 
252
        self.assertTrue("HEAD -> " in stdout)