← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/tests/per_branch/test_push.py

  • Committer: John Arbash Meinel
  • Date: 2009-07-29 21:35:05 UTC
  • mfrom: (4576 +trunk)
  • mto: This revision was merged to the branch mainline in revision 4577.
  • Revision ID: john@arbash-meinel.com-20090729213505-tkqsvy1zfpocu75w
Merge bzr.dev 4576 in prep for NEWS

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/per_branch/test_push.py
35
35
from bzrlib.revision import NULL_REVISION
36
36
from bzrlib.smart import client, server
37
37
from bzrlib.smart.repository import SmartServerRepositoryGetParentMap
38
 
from bzrlib.tests.branch_implementations.test_branch import TestCaseWithBranch
 
38
from bzrlib.tests.per_branch.test_branch import TestCaseWithBranch
39
39
from bzrlib.transport import get_transport
40
40
from bzrlib.transport.local import LocalURLServer
41
41
 
427
427
        cmd = builtins.cmd_push()
428
428
        cmd.outf = tests.StringIOWrapper()
429
429
        cmd.run(
430
 
            directory=self.get_url() + 'empty',
 
430
            directory=self.get_url('empty'),
431
431
            location=self.smart_server.get_url() + 'target')
432
432
        # HPSS calls as of 2008/09/22:
433
433
        # [BzrDir.open, BzrDir.open_branch, BzrDir.find_repositoryV2,