~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

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

  • Committer: Matthew Revell
  • Date: 2008-03-05 14:11:35 UTC
  • mto: This revision was merged to the branch mainline in revision 3263.
  • Revision ID: matthew.revell@canonical.com-20080305141135-96jf8j24b9crru6v
Added an admin-guide directory to doc/en and outlined headings for the admin guide in index.txt

Show diffs side-by-side

added added

removed removed

Lines of Context:
12
12
#
13
13
# You should have received a copy of the GNU General Public License
14
14
# along with this program; if not, write to the Free Software
15
 
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
16
 
 
17
 
 
18
 
from bzrlib import tests
 
15
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 
16
 
 
17
 
19
18
from bzrlib.builtins import cmd_push
20
19
from bzrlib.tests.transport_util import TestCaseWithConnectionHookedTransport
21
20
 
28
27
        self.start_logging_connections()
29
28
 
30
29
        cmd = cmd_push()
31
 
        # We don't care about the ouput but 'outf' should be defined
32
 
        cmd.outf = tests.StringIOWrapper()
33
 
        cmd.run_direct(self.get_url('remote'), directory='branch')
 
30
        cmd.run(self.get_url('remote'), directory='branch')
34
31
        self.assertEquals(1, len(self.connections))
35
32
 
36
 
    def test_push_onto_stacked(self):
37
 
        self.make_branch_and_tree('base', format='1.9')
38
 
        self.make_branch_and_tree('source', format='1.9')
39
 
 
40
 
        self.start_logging_connections()
41
 
 
42
 
        cmd = cmd_push()
43
 
        cmd.outf = tests.StringIOWrapper()
44
 
        cmd.run_direct(self.get_url('remote'), directory='source',
45
 
                stacked_on=self.get_url('base'))
46
 
        self.assertEqual(1, len(self.connections))