← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

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

  • Committer: Jelmer Vernooij
  • Date: 2009-02-10 00:25:52 UTC
  • mto: (3978.3.7 branch-bzrdir-inter)
  • mto: This revision was merged to the branch mainline in revision 4050.
  • Revision ID: jelmer@samba.org-20090210002552-zxrbkhq0bsukybcw
Write status messages during push to stderr rather than stdout.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/blackbox/test_push.py
88
88
        path = branch_a.get_push_location()
89
89
        self.assertEquals(out,
90
90
                          'Using saved push location: %s\n' 
91
 
                          'Pushed up to revision 2.\n'
92
91
                          % local_path_from_url(path))
93
92
        self.assertEqual(err,
94
 
                         'All changes applied successfully.\n')
 
93
                         'All changes applied successfully.\n'
 
94
                         'Pushed up to revision 2.\n')
95
95
        self.assertEqual(path,
96
96
                         branch_b.bzrdir.root_transport.base)
97
97
        # test explicit --remember
103
103
        # bzr push from a branch that does not have a checkout should work.
104
104
        b = self.make_branch('.')
105
105
        out, err = self.run_bzr('push pushed-location')
106
 
        self.assertEqual('Created new branch.\n', out)
107
 
        self.assertEqual('', err)
 
106
        self.assertEqual('', out)
 
107
        self.assertEqual('Created new branch.\n', err)
108
108
        b2 = Branch.open('pushed-location')
109
109
        self.assertEndsWith(b2.base, 'pushed-location/')
110
110
 
119
119
        os.chdir('tree')
120
120
        out, err = self.run_bzr('push pushed-to')
121
121
        os.chdir('..')
122
 
        self.assertEqual('Created new branch.\n', out)
123
 
        self.assertEqual('', err)
 
122
        self.assertEqual('', out)
 
123
        self.assertEqual('Created new branch.\n', err)
124
124
 
125
125
    def test_push_only_pushes_history(self):
126
126
        # Knit branches should only push the history for the current revision.
295
295
        # we publish branch_tree with a reference to the mainline.
296
296
        out, err = self.run_bzr(['push', '--stacked-on', trunk_tree.branch.base,
297
297
            self.get_url('published')], working_dir='branch')
 
298
        self.assertEqual('', out)
298
299
        self.assertEqual('Created new stacked branch referring to %s.\n' %
299
 
            trunk_tree.branch.base, out)
300
 
        self.assertEqual('', err)
 
300
            trunk_tree.branch.base, err)
301
301
        self.assertPublished(branch_tree.last_revision(),
302
302
            trunk_tree.branch.base)
303
303
 
308
308
        # for us.
309
309
        out, err = self.run_bzr(['push', '--stacked',
310
310
            self.get_url('published')], working_dir='branch')
 
311
        self.assertEqual('', out)
311
312
        self.assertEqual('Created new stacked branch referring to %s.\n' %
312
 
            trunk_tree.branch.base, out)
313
 
        self.assertEqual('', err)
 
313
            trunk_tree.branch.base, err)
314
314
        self.assertPublished(branch_tree.last_revision(), trunk_tree.branch.base)
315
315
 
316
316
    def test_push_new_branch_stacked_uses_parent_public(self):
326
326
        # for us.
327
327
        out, err = self.run_bzr(['push', '--stacked',
328
328
            self.get_url('published')], working_dir='branch')
 
329
        self.assertEqual('', out)
329
330
        self.assertEqual('Created new stacked branch referring to %s.\n' %
330
 
            trunk_public_url, out)
331
 
        self.assertEqual('', err)
 
331
            trunk_public_url, err)
332
332
        self.assertPublished(branch_tree.last_revision(), trunk_public_url)
333
333
 
334
334
    def test_push_new_branch_stacked_no_parent(self):