← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

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

  • Committer: John Arbash Meinel
  • Date: 2010-09-25 20:08:01 UTC
  • mfrom: (5444 +trunk)
  • mto: This revision was merged to the branch mainline in revision 5445.
  • Revision ID: john@arbash-meinel.com-20100925200801-7uf0ux3uwxo9i3x0
Merge bzr.dev 5444 to resolve some small text conflicts.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/per_controldir/test_push.py
1
 
# Copyright (C) 2009 Canonical Ltd
 
1
# Copyright (C) 2009, 2010 Canonical Ltd
2
2
#
3
3
# This program is free software; you can redistribute it and/or modify
4
4
# it under the terms of the GNU General Public License as published by
16
16
 
17
17
"""Tests for bzrdir implementations - push."""
18
18
 
19
 
from bzrlib import (
20
 
    errors,
21
 
    )
22
 
from bzrlib.tests.per_bzrdir import (
23
 
    TestCaseWithBzrDir,
24
 
    )
25
 
 
26
 
 
27
 
class TestPush(TestCaseWithBzrDir):
 
19
from bzrlib.tests.per_controldir import (
 
20
    TestCaseWithControlDir,
 
21
    )
 
22
 
 
23
 
 
24
class TestPush(TestCaseWithControlDir):
28
25
 
29
26
    def create_simple_tree(self):
30
27
        tree = self.make_branch_and_tree('tree')