/breezy/unstable

To get this branch, use:
bzr branch https://code.breezy-vcs.org/breezy/unstable

« back to all changes in this revision

Viewing changes to breezy/tests/blackbox/test_dpush.py

  • Committer: Jelmer Vernooij
  • Date: 2017-05-24 01:39:33 UTC
  • mfrom: (3815.3776.6)
  • Revision ID: jelmer@jelmer.uk-20170524013933-ir4y4tqtrsiz2ka2
New upstream snapshot.

Show diffs side-by-side

added added

removed removed

Lines of Context:
15
15
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
16
16
 
17
17
 
18
 
"""Black-box tests for bzr dpush."""
19
 
 
20
 
 
21
 
from bzrlib import (
 
18
"""Black-box tests for brz dpush."""
 
19
 
 
20
 
 
21
from breezy import (
22
22
    branch,
23
23
    tests,
24
24
    )
25
 
from bzrlib.tests import (
 
25
from breezy.tests import (
26
26
    script,
27
27
    test_foreign,
28
28
    )
29
 
from bzrlib.tests.blackbox import test_push
30
 
from bzrlib.tests.scenarios import (
 
29
from breezy.tests.blackbox import test_push
 
30
from breezy.tests.scenarios import (
31
31
    load_tests_apply_scenarios,
32
32
    )
33
33
 
66
66
        dc.open_workingtree().commit('msg')
67
67
 
68
68
        script.run_script(self, """
69
 
            $ bzr dpush -d dc d
 
69
            $ brz dpush -d dc d
70
70
            2>Doing on-the-fly conversion from DummyForeignVcsRepositoryFormat() to RepositoryFormat2a().
71
71
            2>This may take some time. Upgrade the repositories to the same format for better performance.
72
72
            2>Pushed up to revision 2.
73
 
            $ bzr status dc
 
73
            $ brz status dc
74
74
            """)
75
75
 
76
76
    def test_dpush_new(self):
83
83
        dc_tree.commit("msg")
84
84
 
85
85
        script.run_script(self, '''
86
 
            $ bzr dpush -d dc d
 
86
            $ brz dpush -d dc d
87
87
            2>Doing on-the-fly conversion from DummyForeignVcsRepositoryFormat() to RepositoryFormat2a().
88
88
            2>This may take some time. Upgrade the repositories to the same format for better performance.
89
89
            2>Pushed up to revision 2.
90
 
            $ bzr revno dc
 
90
            $ brz revno dc
91
91
            2
92
 
            $ bzr status dc
 
92
            $ brz status dc
93
93
            ''')
94
94
 
95
95
    def test_dpush_wt_diff(self):
103
103
 
104
104
        self.build_tree_contents([("dc/foofile", "blaaaal")])
105
105
        script.run_script(self, '''
106
 
            $ bzr dpush -d dc d --no-strict
 
106
            $ brz dpush -d dc d --no-strict
107
107
            2>Doing on-the-fly conversion from DummyForeignVcsRepositoryFormat() to RepositoryFormat2a().
108
108
            2>This may take some time. Upgrade the repositories to the same format for better performance.
109
109
            2>Pushed up to revision 2.
112
112
        # if the dummy vcs wasn't that dummy we could uncomment the line below
113
113
        # self.assertFileEqual("blaaaa", "d/foofile")
114
114
        script.run_script(self, '''
115
 
            $ bzr status dc
 
115
            $ brz status dc
116
116
            modified:
117
117
              foofile
118
118
            ''')