← 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

merge dirstate and trunk

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/blackbox/test_push.py
80
80
        # test implicit --remember after resolving previous failure
81
81
        uncommit(branch=branch_b, tree=tree_b)
82
82
        transport.delete('branch_b/c')
83
 
        out = self.run_bzr('push')
 
83
        out, err = self.run_bzr('push')
84
84
        path = branch_a.get_push_location()
85
 
        self.assertEquals(('Using saved location: %s\n' 
86
 
                           % (local_path_from_url(path),)
87
 
                          , 'All changes applied successfully.\n'
88
 
                            '1 revision(s) pushed.\n'), out)
 
85
        self.assertEquals(out,
 
86
                          'Using saved location: %s\n' 
 
87
                          'Pushed up to revision 2.\n'
 
88
                          % local_path_from_url(path))
 
89
        self.assertEqual(err,
 
90
                         'All changes applied successfully.\n')
89
91
        self.assertEqual(path,
90
92
                         branch_b.bzrdir.root_transport.base)
91
93
        # test explicit --remember
98
100
        b = self.make_branch('.')
99
101
        out, err = self.run_bzr('push', 'pushed-location')
100
102
        self.assertEqual('', out)
101
 
        self.assertEqual('0 revision(s) pushed.\n', err)
 
103
        self.assertEqual('Created new branch.\n', err)
102
104
        b2 = Branch.open('pushed-location')
103
105
        self.assertEndsWith(b2.base, 'pushed-location/')
104
106
 
114
116
        out, err = self.run_bzr('push', 'pushed-to')
115
117
        os.chdir('..')
116
118
        self.assertEqual('', out)
117
 
        self.assertEqual('1 revision(s) pushed.\n', err)
 
119
        self.assertEqual('Created new branch.\n', err)
118
120
 
119
121
    def test_push_only_pushes_history(self):
120
122
        # Knit branches should only push the history for the current revision.