/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_blackbox.py

Cope with open_branch() actually checking whether there is a branch present.

Show diffs side-by-side

added added

removed removed

Lines of Context:
tests/test_blackbox.py
22
22
 
23
23
import os
24
24
 
25
 
from bzrlib.tests import KnownFailure
 
25
from bzrlib.bzrdir import (
 
26
    BzrDir,
 
27
    )
 
28
 
26
29
from bzrlib.tests.blackbox import ExternalBase
27
30
 
28
31
from bzrlib.plugins.git import (
42
45
 
43
46
    def test_nick(self):
44
47
        GitRepo.init(self.test_dir)
 
48
        dir = BzrDir.open(self.test_dir)
 
49
        dir.create_branch()
45
50
        output, error = self.run_bzr(['nick'])
46
51
        self.assertEquals("HEAD\n", output)
47
52
 
129
134
    def test_init_repo(self):
130
135
        output, error = self.run_bzr(["init-repo", "--git", "bla.git"])
131
136
        self.assertEquals(error, '')
132
 
        self.assertEquals(output, 'Repository branch (format: git)\nLocation:\n  shared repository: bla.git\n  repository branch: bla.git\n')
 
137
        self.assertEquals(output, 'Shared repository with trees (format: git)\nLocation:\n  shared repository: bla.git\n')
133
138