← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/tests/branch_implementations/test_branch.py

Merge Tree.changes_from work.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/branch_implementations/test_branch.py
19
19
import os
20
20
import sys
21
21
 
22
 
from bzrlib import branch, bzrdir, errors, gpg, transactions, repository
 
22
from bzrlib import (
 
23
    branch,
 
24
    bzrdir,
 
25
    errors,
 
26
    gpg,
 
27
    urlutils,
 
28
    transactions,
 
29
    repository,
 
30
    )
23
31
from bzrlib.branch import Branch, needs_read_lock, needs_write_lock
24
32
from bzrlib.delta import TreeDelta
25
33
from bzrlib.errors import (FileExists,
523
531
                                   ensure_config_dir_exists)
524
532
        ensure_config_dir_exists()
525
533
        fn = locations_config_filename()
526
 
        self.get_branch().set_push_location('foo')
 
534
        branch = self.get_branch()
 
535
        branch.set_push_location('foo')
 
536
        local_path = urlutils.local_path_from_url(branch.base[:-1])
527
537
        self.assertFileEqual("[%s]\n"
528
 
                             "push_location = foo" % self.get_branch().base[:-1],
 
538
                             "push_location = foo" % local_path,
529
539
                             fn)
530
540
 
531
541
    # TODO RBC 20051029 test getting a push location from a branch in a