← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

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

  • Committer: Andrew Bennetts
  • Date: 2010-01-12 03:53:21 UTC
  • mfrom: (4948 +trunk)
  • mto: This revision was merged to the branch mainline in revision 4964.
  • Revision ID: andrew.bennetts@canonical.com-20100112035321-hofpz5p10224ryj3
Merge lp:bzr, resolving conflicts.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/commands/test_push.py
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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 
15
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
16
16
 
17
17
 
18
18
from bzrlib import tests
30
30
        cmd = cmd_push()
31
31
        # We don't care about the ouput but 'outf' should be defined
32
32
        cmd.outf = tests.StringIOWrapper()
33
 
        cmd.run(self.get_url('remote'), directory='branch')
 
33
        cmd.run_direct(self.get_url('remote'), directory='branch')
34
34
        self.assertEquals(1, len(self.connections))
35
35
 
36
36
    def test_push_onto_stacked(self):
41
41
 
42
42
        cmd = cmd_push()
43
43
        cmd.outf = tests.StringIOWrapper()
44
 
        cmd.run(self.get_url('remote'), directory='source',
 
44
        cmd.run_direct(self.get_url('remote'), directory='source',
45
45
                stacked_on=self.get_url('base'))
46
46
        self.assertEqual(1, len(self.connections))