← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

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

Fix broken test from refactoring blackbox/test_pull

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/blackbox/test_pull.py
43
43
from bzrlib.tests.HTTPTestUtil import TestCaseWithWebserver
44
44
from bzrlib.tests.blackbox import ExternalBase
45
45
 
46
 
class TestCommands(ExternalBase):
 
46
class TestPull(ExternalBase):
 
47
 
 
48
    def example_branch(test):
 
49
        test.runbzr('init')
 
50
        file('hello', 'wt').write('foo')
 
51
        test.runbzr('add hello')
 
52
        test.runbzr('commit -m setup hello')
 
53
        file('goodbye', 'wt').write('baz')
 
54
        test.runbzr('add goodbye')
 
55
        test.runbzr('commit -m setup goodbye')
47
56
 
48
57
    def test_pull(self):
49
58
        """Pull changes from one branch to another."""
101
110
        self.runbzr('pull ../b')
102
111
        self.runbzr('pull ../b')
103
112
 
104
 
    def test_pull_overwrite_uptodate(self):
 
113
    def test_overwrite_uptodate(self):
105
114
        # Make sure pull --overwrite overwrites
106
115
        # even if the target branch has merged
107
116
        # everything already.
144
153
 
145
154
        self.assertEqual(rev_history_b, rev_history_a)
146
155
 
147
 
    def test_pull_overwrite_children(self):
 
156
    def test_overwrite_children(self):
148
157
        # Make sure pull --overwrite sets the revision-history
149
158
        # to be identical to the pull source, even if we have convergence
150
159
        bzr = self.run_bzr