~bzr-pqm/bzr/bzr.dev

4763.2.4 by John Arbash Meinel
merge bzr.2.1 in preparation for NEWS entry.
1
# Copyright (C) 2005-2010 Canonical Ltd
1887.1.1 by Adeodato Simó
Do not separate paragraphs in the copyright statement with blank lines,
2
#
720 by Martin Pool
- start moving external tests into the testsuite framework
3
# This program is free software; you can redistribute it and/or modify
4
# it under the terms of the GNU General Public License as published by
5
# the Free Software Foundation; either version 2 of the License, or
6
# (at your option) any later version.
1887.1.1 by Adeodato Simó
Do not separate paragraphs in the copyright statement with blank lines,
7
#
720 by Martin Pool
- start moving external tests into the testsuite framework
8
# This program is distributed in the hope that it will be useful,
9
# but WITHOUT ANY WARRANTY; without even the implied warranty of
10
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
11
# GNU General Public License for more details.
1887.1.1 by Adeodato Simó
Do not separate paragraphs in the copyright statement with blank lines,
12
#
720 by Martin Pool
- start moving external tests into the testsuite framework
13
# You should have received a copy of the GNU General Public License
14
# along with this program; if not, write to the Free Software
4183.7.1 by Sabin Iacob
update FSF mailing address
15
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
720 by Martin Pool
- start moving external tests into the testsuite framework
16
1185.46.9 by Aaron Bentley
Added verbose option to bzr add, to list all ignored files.
17
# Mr. Smoketoomuch: I'm sorry?
18
# Mr. Bounder: You'd better cut down a little then.
19
# Mr. Smoketoomuch: Oh, I see! Smoke too much so I'd better cut down a little
20
#                   then!
720 by Martin Pool
- start moving external tests into the testsuite framework
21
22
"""Black-box tests for bzr.
23
24
These check that it behaves properly when it's invoked through the regular
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
25
command-line interface. This doesn't actually run a new interpreter but
1393.1.45 by Martin Pool
doc
26
rather starts again from the run_bzr function.
720 by Martin Pool
- start moving external tests into the testsuite framework
27
"""
28
1393.1.45 by Martin Pool
doc
29
1185.33.14 by Martin Pool
doc
30
# XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
31
# Note: Please don't add new tests here, it's too big and bulky.  Instead add
1512 by Robert Collins
Merge from Martin. Adjust check to work with HTTP again.
32
# them into small suites in bzrlib.tests.blackbox.test_FOO for the particular
33
# UI command/aspect that is being tested.
1185.33.14 by Martin Pool
doc
34
35
1185.1.25 by Robert Collins
merge David Clymer's patch for TestCaseInTestDir.runcmd
36
from cStringIO import StringIO
1185.1.41 by Robert Collins
massive patch from Alexander Belchenko - many PEP8 fixes, removes unused function uuid
37
import os
1185.16.43 by Martin Pool
- clean up handling of option objects
38
import re
974.1.26 by aaron.bentley at utoronto
merged mbp@sourcefrog.net-20050817233101-0939da1cf91f2472
39
import sys
1161 by Martin Pool
- add test that 'bzr add' reports the files as they're added
40
1666.1.4 by Robert Collins
* 'Metadir' is now the default disk format. This improves behaviour in
41
import bzrlib
1996.3.18 by John Arbash Meinel
Now that mkdtemp and rmtree are lazy, they should not be directly improted.
42
from bzrlib import (
43
    osutils,
44
    )
1161 by Martin Pool
- add test that 'bzr add' reports the files as they're added
45
from bzrlib.branch import Branch
1393.3.3 by Jelmer Vernooij
Add test for empty commit messages.
46
from bzrlib.errors import BzrCommandError
2929.3.8 by Vincent Ladeuil
Rename bzrlib/test/HTTPTestUtils.py to bzrlib/tests/http_utils.py and fix uses.
47
from bzrlib.tests.http_utils import TestCaseWithWebserver
1530.1.7 by Robert Collins
merge integration.
48
from bzrlib.tests.test_sftp_transport import TestCaseWithSFTPServer
1513 by Robert Collins
Blackbox tests are maintained within the bzrlib.tests.blackbox directory.
49
from bzrlib.tests.blackbox import ExternalBase
1534.4.26 by Robert Collins
Move working tree initialisation out from Branch.initialize, deprecated Branch.initialize to Branch.create.
50
from bzrlib.workingtree import WorkingTree
1142 by Martin Pool
- remove dead code from blackbox tests (pychecker)
51
1185.65.29 by Robert Collins
Implement final review suggestions.
52
1102 by Martin Pool
- merge test refactoring from robertc
53
class TestCommands(ExternalBase):
54
55
    def test_invalid_commands(self):
2530.3.1 by Martin Pool
Cleanup old variations on run_bzr in the test suite
56
        self.run_bzr("pants", retcode=3)
57
        self.run_bzr("--pants off", retcode=3)
58
        self.run_bzr("diff --message foo", retcode=3)
736 by Martin Pool
- move old blackbox code from testbzr into bzrlib.selftest.blackbox
59
1102 by Martin Pool
- merge test refactoring from robertc
60
    def test_revert(self):
2530.3.1 by Martin Pool
Cleanup old variations on run_bzr in the test suite
61
        self.run_bzr('init')
1102 by Martin Pool
- merge test refactoring from robertc
62
63
        file('hello', 'wt').write('foo')
2530.3.1 by Martin Pool
Cleanup old variations on run_bzr in the test suite
64
        self.run_bzr('add hello')
65
        self.run_bzr('commit -m setup hello')
1102 by Martin Pool
- merge test refactoring from robertc
66
67
        file('goodbye', 'wt').write('baz')
2530.3.1 by Martin Pool
Cleanup old variations on run_bzr in the test suite
68
        self.run_bzr('add goodbye')
69
        self.run_bzr('commit -m setup goodbye')
1092.2.18 by Robert Collins
merge from symlink branch
70
1102 by Martin Pool
- merge test refactoring from robertc
71
        file('hello', 'wt').write('bar')
72
        file('goodbye', 'wt').write('qux')
2530.3.1 by Martin Pool
Cleanup old variations on run_bzr in the test suite
73
        self.run_bzr('revert hello')
1102 by Martin Pool
- merge test refactoring from robertc
74
        self.check_file_contents('hello', 'foo')
75
        self.check_file_contents('goodbye', 'qux')
2530.3.1 by Martin Pool
Cleanup old variations on run_bzr in the test suite
76
        self.run_bzr('revert')
1102 by Martin Pool
- merge test refactoring from robertc
77
        self.check_file_contents('goodbye', 'baz')
78
79
        os.mkdir('revertdir')
2530.3.1 by Martin Pool
Cleanup old variations on run_bzr in the test suite
80
        self.run_bzr('add revertdir')
81
        self.run_bzr('commit -m f')
1102 by Martin Pool
- merge test refactoring from robertc
82
        os.rmdir('revertdir')
2530.3.1 by Martin Pool
Cleanup old variations on run_bzr in the test suite
83
        self.run_bzr('revert')
1102 by Martin Pool
- merge test refactoring from robertc
84
4747.3.6 by Vincent Ladeuil
terminal_width can now returns None.
85
        if osutils.has_symlinks():
1185.31.49 by John Arbash Meinel
Some corrections using the new osutils.rename. **ALL TESTS PASS**
86
            os.symlink('/unlikely/to/exist', 'symlink')
2530.3.1 by Martin Pool
Cleanup old variations on run_bzr in the test suite
87
            self.run_bzr('add symlink')
88
            self.run_bzr('commit -m f')
1185.31.49 by John Arbash Meinel
Some corrections using the new osutils.rename. **ALL TESTS PASS**
89
            os.unlink('symlink')
2530.3.1 by Martin Pool
Cleanup old variations on run_bzr in the test suite
90
            self.run_bzr('revert')
1185.31.49 by John Arbash Meinel
Some corrections using the new osutils.rename. **ALL TESTS PASS**
91
            self.failUnlessExists('symlink')
92
            os.unlink('symlink')
93
            os.symlink('a-different-path', 'symlink')
2530.3.1 by Martin Pool
Cleanup old variations on run_bzr in the test suite
94
            self.run_bzr('revert')
1185.31.49 by John Arbash Meinel
Some corrections using the new osutils.rename. **ALL TESTS PASS**
95
            self.assertEqual('/unlikely/to/exist',
96
                             os.readlink('symlink'))
97
        else:
98
            self.log("skipping revert symlink tests")
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
99
1185.5.8 by John Arbash Meinel
Fixed bzr revert with the new RevisionSpec code.
100
        file('hello', 'wt').write('xyz')
2530.3.1 by Martin Pool
Cleanup old variations on run_bzr in the test suite
101
        self.run_bzr('commit -m xyz hello')
102
        self.run_bzr('revert -r 1 hello')
1185.5.8 by John Arbash Meinel
Fixed bzr revert with the new RevisionSpec code.
103
        self.check_file_contents('hello', 'foo')
2530.3.1 by Martin Pool
Cleanup old variations on run_bzr in the test suite
104
        self.run_bzr('revert hello')
1185.5.8 by John Arbash Meinel
Fixed bzr revert with the new RevisionSpec code.
105
        self.check_file_contents('hello', 'xyz')
1185.8.5 by Aaron Bentley
Fixed non-tree-root bug in branch, revert, merge
106
        os.chdir('revertdir')
2530.3.1 by Martin Pool
Cleanup old variations on run_bzr in the test suite
107
        self.run_bzr('revert')
1185.8.5 by Aaron Bentley
Fixed non-tree-root bug in branch, revert, merge
108
        os.chdir('..')
109
1092.1.39 by Robert Collins
merge from mpool
110
    def example_branch(test):
2530.3.1 by Martin Pool
Cleanup old variations on run_bzr in the test suite
111
        test.run_bzr('init')
1092.1.39 by Robert Collins
merge from mpool
112
        file('hello', 'wt').write('foo')
2530.3.1 by Martin Pool
Cleanup old variations on run_bzr in the test suite
113
        test.run_bzr('add hello')
114
        test.run_bzr('commit -m setup hello')
1092.1.39 by Robert Collins
merge from mpool
115
        file('goodbye', 'wt').write('baz')
2530.3.1 by Martin Pool
Cleanup old variations on run_bzr in the test suite
116
        test.run_bzr('add goodbye')
117
        test.run_bzr('commit -m setup goodbye')
1092.1.39 by Robert Collins
merge from mpool
118
1185.32.2 by John Arbash Meinel
Refactor pull --verbose into a log.py function, add tests.
119
    def test_pull_verbose(self):
120
        """Pull changes from one branch to another and watch the output."""
121
122
        os.mkdir('a')
123
        os.chdir('a')
124
125
        self.example_branch()
126
127
        os.chdir('..')
2530.3.1 by Martin Pool
Cleanup old variations on run_bzr in the test suite
128
        self.run_bzr('branch a b')
1185.32.2 by John Arbash Meinel
Refactor pull --verbose into a log.py function, add tests.
129
        os.chdir('b')
130
        open('b', 'wb').write('else\n')
2530.3.1 by Martin Pool
Cleanup old variations on run_bzr in the test suite
131
        self.run_bzr('add b')
2530.3.4 by Martin Pool
Deprecate run_bzr_captured in favour of just run_bzr
132
        self.run_bzr(['commit', '-m', 'added b'])
1185.32.2 by John Arbash Meinel
Refactor pull --verbose into a log.py function, add tests.
133
134
        os.chdir('../a')
2530.3.1 by Martin Pool
Cleanup old variations on run_bzr in the test suite
135
        out = self.run_bzr('pull --verbose ../b')[0]
1185.32.2 by John Arbash Meinel
Refactor pull --verbose into a log.py function, add tests.
136
        self.failIfEqual(out.find('Added Revisions:'), -1)
137
        self.failIfEqual(out.find('message:\n  added b'), -1)
1185.33.27 by Martin Pool
[merge] much integrated work from robert and john
138
        self.failIfEqual(out.find('added b'), -1)
1185.32.2 by John Arbash Meinel
Refactor pull --verbose into a log.py function, add tests.
139
1185.32.4 by John Arbash Meinel
[merge] up-to-date against bzr.dev
140
        # Check that --overwrite --verbose prints out the removed entries
2530.3.1 by Martin Pool
Cleanup old variations on run_bzr in the test suite
141
        self.run_bzr('commit -m foo --unchanged')
1185.32.2 by John Arbash Meinel
Refactor pull --verbose into a log.py function, add tests.
142
        os.chdir('../b')
2530.3.1 by Martin Pool
Cleanup old variations on run_bzr in the test suite
143
        self.run_bzr('commit -m baz --unchanged')
144
        self.run_bzr('pull ../a', retcode=3)
145
        out = self.run_bzr('pull --overwrite --verbose ../a')[0]
1185.32.2 by John Arbash Meinel
Refactor pull --verbose into a log.py function, add tests.
146
147
        remove_loc = out.find('Removed Revisions:')
148
        self.failIfEqual(remove_loc, -1)
149
        added_loc = out.find('Added Revisions:')
150
        self.failIfEqual(added_loc, -1)
151
152
        removed_message = out.find('message:\n  baz')
153
        self.failIfEqual(removed_message, -1)
154
        self.failUnless(remove_loc < removed_message < added_loc)
155
156
        added_message = out.find('message:\n  foo')
157
        self.failIfEqual(added_message, -1)
158
        self.failUnless(added_loc < added_message)
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
159
1185.12.11 by Aaron Bentley
Made pull only save the parent location if it is unset, or on --remember
160
    def test_locations(self):
161
        """Using and remembering different locations"""
162
        os.mkdir('a')
163
        os.chdir('a')
2530.3.1 by Martin Pool
Cleanup old variations on run_bzr in the test suite
164
        self.run_bzr('init')
165
        self.run_bzr('commit -m unchanged --unchanged')
166
        self.run_bzr('pull', retcode=3)
167
        self.run_bzr('merge', retcode=3)
168
        self.run_bzr('branch . ../b')
1185.12.11 by Aaron Bentley
Made pull only save the parent location if it is unset, or on --remember
169
        os.chdir('../b')
2530.3.1 by Martin Pool
Cleanup old variations on run_bzr in the test suite
170
        self.run_bzr('pull')
171
        self.run_bzr('branch . ../c')
172
        self.run_bzr('pull ../c')
173
        self.run_bzr('merge')
1185.12.11 by Aaron Bentley
Made pull only save the parent location if it is unset, or on --remember
174
        os.chdir('../a')
2530.3.1 by Martin Pool
Cleanup old variations on run_bzr in the test suite
175
        self.run_bzr('pull ../b')
176
        self.run_bzr('pull')
177
        self.run_bzr('pull ../c')
178
        self.run_bzr('branch ../c ../d')
1996.3.18 by John Arbash Meinel
Now that mkdtemp and rmtree are lazy, they should not be directly improted.
179
        osutils.rmtree('../c')
2530.3.1 by Martin Pool
Cleanup old variations on run_bzr in the test suite
180
        self.run_bzr('pull')
1185.12.11 by Aaron Bentley
Made pull only save the parent location if it is unset, or on --remember
181
        os.chdir('../b')
2530.3.1 by Martin Pool
Cleanup old variations on run_bzr in the test suite
182
        self.run_bzr('pull')
1185.12.11 by Aaron Bentley
Made pull only save the parent location if it is unset, or on --remember
183
        os.chdir('../d')
2530.3.1 by Martin Pool
Cleanup old variations on run_bzr in the test suite
184
        self.run_bzr('pull', retcode=3)
185
        self.run_bzr('pull ../a --remember')
186
        self.run_bzr('pull')
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
187
1185.3.20 by Martin Pool
- run_bzr_captured also includes logged errors in
188
    def test_unknown_command(self):
189
        """Handling of unknown command."""
2552.2.4 by Vincent Ladeuil
Merge bzr.dev and resolve conflits. (good use case for an enhanced merge
190
        out, err = self.run_bzr('fluffy-badger', retcode=3)
1185.3.20 by Martin Pool
- run_bzr_captured also includes logged errors in
191
        self.assertEquals(out, '')
192
        err.index('unknown command')
1185.14.9 by Aaron Bentley
Added tests for 'bzr conflicts', 'bzr resolve'
193
1185.35.4 by Aaron Bentley
Implemented remerge
194
    def create_conflicts(self):
195
        """Create a conflicted tree"""
1185.14.9 by Aaron Bentley
Added tests for 'bzr conflicts', 'bzr resolve'
196
        os.mkdir('base')
197
        os.chdir('base')
198
        file('hello', 'wb').write("hi world")
199
        file('answer', 'wb').write("42")
2530.3.1 by Martin Pool
Cleanup old variations on run_bzr in the test suite
200
        self.run_bzr('init')
201
        self.run_bzr('add')
202
        self.run_bzr('commit -m base')
203
        self.run_bzr('branch . ../other')
204
        self.run_bzr('branch . ../this')
1185.14.9 by Aaron Bentley
Added tests for 'bzr conflicts', 'bzr resolve'
205
        os.chdir('../other')
206
        file('hello', 'wb').write("Hello.")
207
        file('answer', 'wb').write("Is anyone there?")
2530.3.1 by Martin Pool
Cleanup old variations on run_bzr in the test suite
208
        self.run_bzr('commit -m other')
1185.14.9 by Aaron Bentley
Added tests for 'bzr conflicts', 'bzr resolve'
209
        os.chdir('../this')
210
        file('hello', 'wb').write("Hello, world")
2530.3.1 by Martin Pool
Cleanup old variations on run_bzr in the test suite
211
        self.run_bzr('mv answer question')
1185.14.9 by Aaron Bentley
Added tests for 'bzr conflicts', 'bzr resolve'
212
        file('question', 'wb').write("What do you get when you multiply six"
213
                                   "times nine?")
2530.3.1 by Martin Pool
Cleanup old variations on run_bzr in the test suite
214
        self.run_bzr('commit -m this')
1185.35.4 by Aaron Bentley
Implemented remerge
215
1185.65.6 by Aaron Bentley
Fixed inner merges in status
216
    def test_status(self):
217
        os.mkdir('branch1')
218
        os.chdir('branch1')
2530.3.1 by Martin Pool
Cleanup old variations on run_bzr in the test suite
219
        self.run_bzr('init')
220
        self.run_bzr('commit --unchanged --message f')
221
        self.run_bzr('branch . ../branch2')
222
        self.run_bzr('branch . ../branch3')
223
        self.run_bzr('commit --unchanged --message peter')
1185.65.6 by Aaron Bentley
Fixed inner merges in status
224
        os.chdir('../branch2')
2530.3.1 by Martin Pool
Cleanup old variations on run_bzr in the test suite
225
        self.run_bzr('merge ../branch1')
226
        self.run_bzr('commit --unchanged --message pumpkin')
1185.65.6 by Aaron Bentley
Fixed inner merges in status
227
        os.chdir('../branch3')
2530.3.1 by Martin Pool
Cleanup old variations on run_bzr in the test suite
228
        self.run_bzr('merge ../branch2')
2530.3.4 by Martin Pool
Deprecate run_bzr_captured in favour of just run_bzr
229
        message = self.run_bzr('status')[0]
1185.65.6 by Aaron Bentley
Fixed inner merges in status
230
1185.35.4 by Aaron Bentley
Implemented remerge
231
232
    def test_conflicts(self):
233
        """Handling of merge conflicts"""
234
        self.create_conflicts()
2530.3.1 by Martin Pool
Cleanup old variations on run_bzr in the test suite
235
        self.run_bzr('merge ../other --show-base', retcode=1)
1185.18.1 by Aaron Bentley
Added --show-base to merge
236
        conflict_text = file('hello').read()
1185.16.145 by Martin Pool
Remove all assert statements from test cases.
237
        self.assert_('<<<<<<<' in conflict_text)
238
        self.assert_('>>>>>>>' in conflict_text)
239
        self.assert_('=======' in conflict_text)
240
        self.assert_('|||||||' in conflict_text)
241
        self.assert_('hi world' in conflict_text)
2530.3.1 by Martin Pool
Cleanup old variations on run_bzr in the test suite
242
        self.run_bzr('revert')
243
        self.run_bzr('resolve --all')
244
        self.run_bzr('merge ../other', retcode=1)
1185.18.1 by Aaron Bentley
Added --show-base to merge
245
        conflict_text = file('hello').read()
1185.16.145 by Martin Pool
Remove all assert statements from test cases.
246
        self.assert_('|||||||' not in conflict_text)
247
        self.assert_('hi world' not in conflict_text)
2530.3.1 by Martin Pool
Cleanup old variations on run_bzr in the test suite
248
        result = self.run_bzr('conflicts')[0]
1534.10.9 by Aaron Bentley
Switched display functions to conflict_lines
249
        self.assertEquals(result, "Text conflict in hello\nText conflict in"
250
                                  " question\n")
2530.3.1 by Martin Pool
Cleanup old variations on run_bzr in the test suite
251
        result = self.run_bzr('status')[0]
1534.10.9 by Aaron Bentley
Switched display functions to conflict_lines
252
        self.assert_("conflicts:\n  Text conflict in hello\n"
253
                     "  Text conflict in question\n" in result, result)
2530.3.1 by Martin Pool
Cleanup old variations on run_bzr in the test suite
254
        self.run_bzr('resolve hello')
255
        result = self.run_bzr('conflicts')[0]
1534.10.9 by Aaron Bentley
Switched display functions to conflict_lines
256
        self.assertEquals(result, "Text conflict in question\n")
2530.3.1 by Martin Pool
Cleanup old variations on run_bzr in the test suite
257
        self.run_bzr('commit -m conflicts', retcode=3)
258
        self.run_bzr('resolve --all')
259
        result = self.run_bzr('conflicts')[0]
260
        self.run_bzr('commit -m conflicts')
1185.14.9 by Aaron Bentley
Added tests for 'bzr conflicts', 'bzr resolve'
261
        self.assertEquals(result, "")
1185.3.20 by Martin Pool
- run_bzr_captured also includes logged errors in
262
1490 by Robert Collins
Implement a 'bzr push' command, with saved locations; update diff to return 1.
263
    def test_push(self):
264
        # create a source branch
265
        os.mkdir('my-branch')
266
        os.chdir('my-branch')
267
        self.example_branch()
268
269
        # with no push target, fail
2530.3.1 by Martin Pool
Cleanup old variations on run_bzr in the test suite
270
        self.run_bzr('push', retcode=3)
1490 by Robert Collins
Implement a 'bzr push' command, with saved locations; update diff to return 1.
271
        # with an explicit target work
2530.3.1 by Martin Pool
Cleanup old variations on run_bzr in the test suite
272
        self.run_bzr('push ../output-branch')
1490 by Robert Collins
Implement a 'bzr push' command, with saved locations; update diff to return 1.
273
        # with an implicit target work
2530.3.1 by Martin Pool
Cleanup old variations on run_bzr in the test suite
274
        self.run_bzr('push')
1490 by Robert Collins
Implement a 'bzr push' command, with saved locations; update diff to return 1.
275
        # nothing missing
2530.3.1 by Martin Pool
Cleanup old variations on run_bzr in the test suite
276
        self.run_bzr('missing ../output-branch')
1490 by Robert Collins
Implement a 'bzr push' command, with saved locations; update diff to return 1.
277
        # advance this branch
2530.3.1 by Martin Pool
Cleanup old variations on run_bzr in the test suite
278
        self.run_bzr('commit --unchanged -m unchanged')
1490 by Robert Collins
Implement a 'bzr push' command, with saved locations; update diff to return 1.
279
280
        os.chdir('../output-branch')
1185.50.6 by John Arbash Meinel
Fixed a broken test from my 'push updates local working tree' fix
281
        # There is no longer a difference as long as we have
282
        # access to the working tree
2530.3.1 by Martin Pool
Cleanup old variations on run_bzr in the test suite
283
        self.run_bzr('diff')
1185.50.6 by John Arbash Meinel
Fixed a broken test from my 'push updates local working tree' fix
284
285
        # But we should be missing a revision
2530.3.1 by Martin Pool
Cleanup old variations on run_bzr in the test suite
286
        self.run_bzr('missing ../my-branch', retcode=1)
1185.50.6 by John Arbash Meinel
Fixed a broken test from my 'push updates local working tree' fix
287
1490 by Robert Collins
Implement a 'bzr push' command, with saved locations; update diff to return 1.
288
        # diverge the branches
2530.3.1 by Martin Pool
Cleanup old variations on run_bzr in the test suite
289
        self.run_bzr('commit --unchanged -m unchanged')
1490 by Robert Collins
Implement a 'bzr push' command, with saved locations; update diff to return 1.
290
        os.chdir('../my-branch')
291
        # cannot push now
2530.3.1 by Martin Pool
Cleanup old variations on run_bzr in the test suite
292
        self.run_bzr('push', retcode=3)
1490 by Robert Collins
Implement a 'bzr push' command, with saved locations; update diff to return 1.
293
        # and there are difference
2530.3.1 by Martin Pool
Cleanup old variations on run_bzr in the test suite
294
        self.run_bzr('missing ../output-branch', retcode=1)
295
        self.run_bzr('missing --verbose ../output-branch', retcode=1)
1490 by Robert Collins
Implement a 'bzr push' command, with saved locations; update diff to return 1.
296
        # but we can force a push
2530.3.1 by Martin Pool
Cleanup old variations on run_bzr in the test suite
297
        self.run_bzr('push --overwrite')
1490 by Robert Collins
Implement a 'bzr push' command, with saved locations; update diff to return 1.
298
        # nothing missing
2530.3.1 by Martin Pool
Cleanup old variations on run_bzr in the test suite
299
        self.run_bzr('missing ../output-branch')
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
300
1495 by Robert Collins
Add a --create-prefix to the new push command.
301
        # pushing to a new dir with no parent should fail
2530.3.1 by Martin Pool
Cleanup old variations on run_bzr in the test suite
302
        self.run_bzr('push ../missing/new-branch', retcode=3)
1495 by Robert Collins
Add a --create-prefix to the new push command.
303
        # unless we provide --create-prefix
2530.3.1 by Martin Pool
Cleanup old variations on run_bzr in the test suite
304
        self.run_bzr('push --create-prefix ../missing/new-branch')
1495 by Robert Collins
Add a --create-prefix to the new push command.
305
        # nothing missing
2530.3.1 by Martin Pool
Cleanup old variations on run_bzr in the test suite
306
        self.run_bzr('missing ../missing/new-branch')
1490 by Robert Collins
Implement a 'bzr push' command, with saved locations; update diff to return 1.
307
1185.31.3 by John Arbash Meinel
Fix ExternalCommand to not run random files in the current directory, unless it is truly in BZRPATH
308
    def test_external_command(self):
1588.1.1 by Martin Pool
Supress "hello from test-command" noise from test_external_command
309
        """Test that external commands can be run by setting the path
310
        """
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
311
        # We don't at present run bzr in a subprocess for blackbox tests, and so
1588.1.1 by Martin Pool
Supress "hello from test-command" noise from test_external_command
312
        # don't really capture stdout, only the internal python stream.
313
        # Therefore we don't use a subcommand that produces any output or does
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
314
        # anything -- we just check that it can be run successfully.
1185.31.3 by John Arbash Meinel
Fix ExternalCommand to not run random files in the current directory, unless it is truly in BZRPATH
315
        cmd_name = 'test-command'
316
        if sys.platform == 'win32':
317
            cmd_name += '.bat'
318
        oldpath = os.environ.get('BZRPATH', None)
319
        try:
1963.2.1 by Robey Pointer
remove usage of has_key()
320
            if 'BZRPATH' in os.environ:
1185.31.3 by John Arbash Meinel
Fix ExternalCommand to not run random files in the current directory, unless it is truly in BZRPATH
321
                del os.environ['BZRPATH']
322
323
            f = file(cmd_name, 'wb')
324
            if sys.platform == 'win32':
325
                f.write('@echo off\n')
326
            else:
327
                f.write('#!/bin/sh\n')
1588.1.1 by Martin Pool
Supress "hello from test-command" noise from test_external_command
328
            # f.write('echo Hello from test-command')
1185.31.3 by John Arbash Meinel
Fix ExternalCommand to not run random files in the current directory, unless it is truly in BZRPATH
329
            f.close()
330
            os.chmod(cmd_name, 0755)
331
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
332
            # It should not find the command in the local
1185.31.3 by John Arbash Meinel
Fix ExternalCommand to not run random files in the current directory, unless it is truly in BZRPATH
333
            # directory by default, since it is not in my path
2530.3.1 by Martin Pool
Cleanup old variations on run_bzr in the test suite
334
            self.run_bzr(cmd_name, retcode=3)
1185.31.3 by John Arbash Meinel
Fix ExternalCommand to not run random files in the current directory, unless it is truly in BZRPATH
335
336
            # Now put it into my path
337
            os.environ['BZRPATH'] = '.'
338
2530.3.1 by Martin Pool
Cleanup old variations on run_bzr in the test suite
339
            self.run_bzr(cmd_name)
1185.31.3 by John Arbash Meinel
Fix ExternalCommand to not run random files in the current directory, unless it is truly in BZRPATH
340
341
            # Make sure empty path elements are ignored
342
            os.environ['BZRPATH'] = os.pathsep
343
2530.3.1 by Martin Pool
Cleanup old variations on run_bzr in the test suite
344
            self.run_bzr(cmd_name, retcode=3)
1185.31.3 by John Arbash Meinel
Fix ExternalCommand to not run random files in the current directory, unless it is truly in BZRPATH
345
346
        finally:
347
            if oldpath:
348
                os.environ['BZRPATH'] = oldpath
349
350
1092.2.6 by Robert Collins
symlink support updated to work
351
def listdir_sorted(dir):
352
    L = os.listdir(dir)
353
    L.sort()
354
    return L
1185.3.20 by Martin Pool
- run_bzr_captured also includes logged errors in
355
1092.2.12 by Robert Collins
merge from HEAD
356
904 by Martin Pool
- more selftest external-command fixes
357
class OldTests(ExternalBase):
1092.1.39 by Robert Collins
merge from mpool
358
    """old tests moved from ./testbzr."""
359
1102 by Martin Pool
- merge test refactoring from robertc
360
    def test_bzr(self):
736 by Martin Pool
- move old blackbox code from testbzr into bzrlib.selftest.blackbox
361
        from os import chdir, mkdir
362
        from os.path import exists
363
364
        progress = self.log
365
366
        progress("basic branch creation")
904 by Martin Pool
- more selftest external-command fixes
367
        mkdir('branch1')
736 by Martin Pool
- move old blackbox code from testbzr into bzrlib.selftest.blackbox
368
        chdir('branch1')
2530.3.1 by Martin Pool
Cleanup old variations on run_bzr in the test suite
369
        self.run_bzr('init')
736 by Martin Pool
- move old blackbox code from testbzr into bzrlib.selftest.blackbox
370
2823.1.6 by Vincent Ladeuil
Redo minor fix.
371
        self.assertIsSameRealPath(self.run_bzr('root')[0].rstrip(),
4747.3.6 by Vincent Ladeuil
terminal_width can now returns None.
372
                                  osutils.pathjoin(self.test_dir, 'branch1'))
736 by Martin Pool
- move old blackbox code from testbzr into bzrlib.selftest.blackbox
373
374
        progress("status of new file")
375
376
        f = file('test.txt', 'wt')
377
        f.write('hello world!\n')
378
        f.close()
379
2530.3.4 by Martin Pool
Deprecate run_bzr_captured in favour of just run_bzr
380
        self.assertEquals(self.run_bzr('unknowns')[0], 'test.txt\n')
736 by Martin Pool
- move old blackbox code from testbzr into bzrlib.selftest.blackbox
381
2530.3.4 by Martin Pool
Deprecate run_bzr_captured in favour of just run_bzr
382
        out = self.run_bzr("status")[0]
1185.16.145 by Martin Pool
Remove all assert statements from test cases.
383
        self.assertEquals(out, 'unknown:\n  test.txt\n')
736 by Martin Pool
- move old blackbox code from testbzr into bzrlib.selftest.blackbox
384
385
        f = file('test2.txt', 'wt')
386
        f.write('goodbye cruel world...\n')
387
        f.close()
388
2530.3.4 by Martin Pool
Deprecate run_bzr_captured in favour of just run_bzr
389
        out = self.run_bzr("status test.txt")[0]
1185.16.145 by Martin Pool
Remove all assert statements from test cases.
390
        self.assertEquals(out, "unknown:\n  test.txt\n")
736 by Martin Pool
- move old blackbox code from testbzr into bzrlib.selftest.blackbox
391
2530.3.4 by Martin Pool
Deprecate run_bzr_captured in favour of just run_bzr
392
        out = self.run_bzr("status")[0]
1185.16.145 by Martin Pool
Remove all assert statements from test cases.
393
        self.assertEquals(out, ("unknown:\n" "  test.txt\n" "  test2.txt\n"))
736 by Martin Pool
- move old blackbox code from testbzr into bzrlib.selftest.blackbox
394
395
        os.unlink('test2.txt')
396
397
        progress("command aliases")
2530.3.4 by Martin Pool
Deprecate run_bzr_captured in favour of just run_bzr
398
        out = self.run_bzr("st")[0]
1185.16.145 by Martin Pool
Remove all assert statements from test cases.
399
        self.assertEquals(out, ("unknown:\n" "  test.txt\n"))
736 by Martin Pool
- move old blackbox code from testbzr into bzrlib.selftest.blackbox
400
2530.3.4 by Martin Pool
Deprecate run_bzr_captured in favour of just run_bzr
401
        out = self.run_bzr("stat")[0]
1185.16.145 by Martin Pool
Remove all assert statements from test cases.
402
        self.assertEquals(out, ("unknown:\n" "  test.txt\n"))
736 by Martin Pool
- move old blackbox code from testbzr into bzrlib.selftest.blackbox
403
404
        progress("command help")
2530.3.1 by Martin Pool
Cleanup old variations on run_bzr in the test suite
405
        self.run_bzr("help st")
406
        self.run_bzr("help")
407
        self.run_bzr("help commands")
408
        self.run_bzr("help slartibartfast", retcode=3)
736 by Martin Pool
- move old blackbox code from testbzr into bzrlib.selftest.blackbox
409
2530.3.4 by Martin Pool
Deprecate run_bzr_captured in favour of just run_bzr
410
        out = self.run_bzr("help ci")[0]
2666.1.1 by Ian Clatworthy
Bazaar User Reference generated from online help
411
        out.index('Aliases:  ci, checkin\n')
736 by Martin Pool
- move old blackbox code from testbzr into bzrlib.selftest.blackbox
412
413
        f = file('hello.txt', 'wt')
414
        f.write('some nice new content\n')
415
        f.close()
416
2530.3.1 by Martin Pool
Cleanup old variations on run_bzr in the test suite
417
        self.run_bzr("add hello.txt")
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
418
736 by Martin Pool
- move old blackbox code from testbzr into bzrlib.selftest.blackbox
419
        f = file('msg.tmp', 'wt')
1185.12.25 by Aaron Bentley
Added one-line log format
420
        f.write('this is my new commit\nand it has multiple lines, for fun')
736 by Martin Pool
- move old blackbox code from testbzr into bzrlib.selftest.blackbox
421
        f.close()
422
2530.3.1 by Martin Pool
Cleanup old variations on run_bzr in the test suite
423
        self.run_bzr('commit -F msg.tmp')
424
2530.3.4 by Martin Pool
Deprecate run_bzr_captured in favour of just run_bzr
425
        self.assertEquals(self.run_bzr('revno')[0], '1\n')
2530.3.1 by Martin Pool
Cleanup old variations on run_bzr in the test suite
426
        self.run_bzr('export -r 1 export-1.tmp')
427
        self.run_bzr('export export.tmp')
428
429
        self.run_bzr('log')
430
        self.run_bzr('log -v')
431
        self.run_bzr('log -v --forward')
432
        self.run_bzr('log -m', retcode=3)
2530.3.4 by Martin Pool
Deprecate run_bzr_captured in favour of just run_bzr
433
        log_out = self.run_bzr('log -m commit')[0]
1185.16.145 by Martin Pool
Remove all assert statements from test cases.
434
        self.assert_("this is my new commit\n  and" in log_out)
435
        self.assert_("rename nested" not in log_out)
436
        self.assert_('revision-id' not in log_out)
2530.3.4 by Martin Pool
Deprecate run_bzr_captured in favour of just run_bzr
437
        self.assert_('revision-id' in self.run_bzr('log --show-ids -m commit')[0])
736 by Martin Pool
- move old blackbox code from testbzr into bzrlib.selftest.blackbox
438
2530.3.4 by Martin Pool
Deprecate run_bzr_captured in favour of just run_bzr
439
        log_out = self.run_bzr('log --line')[0]
1692.3.5 by Robert Collins
Merge integration, fixing test failure in test_too_much due to terminal width changing.
440
        # determine the widest line we want
4747.3.6 by Vincent Ladeuil
terminal_width can now returns None.
441
        max_width = osutils.terminal_width()
442
        if max_width is not None:
443
            for line in log_out.splitlines():
444
                self.assert_(len(line) <= max_width - 1, len(line))
1740.2.5 by Aaron Bentley
Merge from bzr.dev
445
        self.assert_("this is my new commit and" not in log_out)
446
        self.assert_("this is my new commit" in log_out)
1185.12.25 by Aaron Bentley
Added one-line log format
447
736 by Martin Pool
- move old blackbox code from testbzr into bzrlib.selftest.blackbox
448
        progress("file with spaces in name")
449
        mkdir('sub directory')
450
        file('sub directory/file with spaces ', 'wt').write('see how this works\n')
2530.3.1 by Martin Pool
Cleanup old variations on run_bzr in the test suite
451
        self.run_bzr('add .')
452
        self.run_bzr('diff', retcode=1)
453
        self.run_bzr('commit -m add-spaces')
454
        self.run_bzr('check')
455
456
        self.run_bzr('log')
457
        self.run_bzr('log --forward')
458
459
        self.run_bzr('info')
1092.1.35 by Robert Collins
merge from mpool up to rev 1110
460
4747.3.6 by Vincent Ladeuil
terminal_width can now returns None.
461
        if osutils.has_symlinks():
1092.2.6 by Robert Collins
symlink support updated to work
462
            progress("symlinks")
463
            mkdir('symlinks')
464
            chdir('symlinks')
2530.3.1 by Martin Pool
Cleanup old variations on run_bzr in the test suite
465
            self.run_bzr('init')
1092.2.6 by Robert Collins
symlink support updated to work
466
            os.symlink("NOWHERE1", "link1")
2530.3.1 by Martin Pool
Cleanup old variations on run_bzr in the test suite
467
            self.run_bzr('add link1')
2530.3.4 by Martin Pool
Deprecate run_bzr_captured in favour of just run_bzr
468
            self.assertEquals(self.run_bzr('unknowns')[0], '')
469
            self.run_bzr(['commit', '-m', '1: added symlink link1'])
2552.2.2 by Vincent Ladeuil
Enforce run_bzr(string) where possible.
470
1092.2.6 by Robert Collins
symlink support updated to work
471
            mkdir('d1')
2530.3.1 by Martin Pool
Cleanup old variations on run_bzr in the test suite
472
            self.run_bzr('add d1')
2530.3.4 by Martin Pool
Deprecate run_bzr_captured in favour of just run_bzr
473
            self.assertEquals(self.run_bzr('unknowns')[0], '')
1092.2.6 by Robert Collins
symlink support updated to work
474
            os.symlink("NOWHERE2", "d1/link2")
2530.3.4 by Martin Pool
Deprecate run_bzr_captured in favour of just run_bzr
475
            self.assertEquals(self.run_bzr('unknowns')[0], 'd1/link2\n')
1092.2.6 by Robert Collins
symlink support updated to work
476
            # is d1/link2 found when adding d1
2530.3.1 by Martin Pool
Cleanup old variations on run_bzr in the test suite
477
            self.run_bzr('add d1')
2530.3.4 by Martin Pool
Deprecate run_bzr_captured in favour of just run_bzr
478
            self.assertEquals(self.run_bzr('unknowns')[0], '')
1092.2.6 by Robert Collins
symlink support updated to work
479
            os.symlink("NOWHERE3", "d1/link3")
2530.3.4 by Martin Pool
Deprecate run_bzr_captured in favour of just run_bzr
480
            self.assertEquals(self.run_bzr('unknowns')[0], 'd1/link3\n')
481
            self.run_bzr(['commit', '-m', '2: added dir, symlink'])
2552.2.2 by Vincent Ladeuil
Enforce run_bzr(string) where possible.
482
2530.3.1 by Martin Pool
Cleanup old variations on run_bzr in the test suite
483
            self.run_bzr('rename d1 d2')
484
            self.run_bzr('move d2/link2 .')
485
            self.run_bzr('move link1 d2')
1185.16.145 by Martin Pool
Remove all assert statements from test cases.
486
            self.assertEquals(os.readlink("./link2"), "NOWHERE2")
487
            self.assertEquals(os.readlink("d2/link1"), "NOWHERE1")
2530.3.1 by Martin Pool
Cleanup old variations on run_bzr in the test suite
488
            self.run_bzr('add d2/link3')
489
            self.run_bzr('diff', retcode=1)
2552.2.2 by Vincent Ladeuil
Enforce run_bzr(string) where possible.
490
            self.run_bzr(['commit', '-m',
491
                          '3: rename of dir, move symlinks, add link3'])
492
1092.2.6 by Robert Collins
symlink support updated to work
493
            os.unlink("link2")
494
            os.symlink("TARGET 2", "link2")
495
            os.unlink("d2/link1")
496
            os.symlink("TARGET 1", "d2/link1")
2530.3.1 by Martin Pool
Cleanup old variations on run_bzr in the test suite
497
            self.run_bzr('diff', retcode=1)
2530.3.4 by Martin Pool
Deprecate run_bzr_captured in favour of just run_bzr
498
            self.assertEquals(self.run_bzr("relpath d2/link1")[0], "d2/link1\n")
499
            self.run_bzr(['commit', '-m', '4: retarget of two links'])
2552.2.2 by Vincent Ladeuil
Enforce run_bzr(string) where possible.
500
2530.3.1 by Martin Pool
Cleanup old variations on run_bzr in the test suite
501
            self.run_bzr('remove --keep d2/link1')
2530.3.4 by Martin Pool
Deprecate run_bzr_captured in favour of just run_bzr
502
            self.assertEquals(self.run_bzr('unknowns')[0], 'd2/link1\n')
503
            self.run_bzr(['commit', '-m', '5: remove d2/link1'])
2292.1.23 by Marius Kruger
Revert test_too_much.py and just do the minimum te get the tests to pass.
504
            # try with the rm alias
2530.3.1 by Martin Pool
Cleanup old variations on run_bzr in the test suite
505
            self.run_bzr('add d2/link1')
2530.3.4 by Martin Pool
Deprecate run_bzr_captured in favour of just run_bzr
506
            self.run_bzr(['commit', '-m', '6: add d2/link1'])
2530.3.1 by Martin Pool
Cleanup old variations on run_bzr in the test suite
507
            self.run_bzr('rm --keep d2/link1')
2530.3.4 by Martin Pool
Deprecate run_bzr_captured in favour of just run_bzr
508
            self.assertEquals(self.run_bzr('unknowns')[0], 'd2/link1\n')
509
            self.run_bzr(['commit', '-m', '7: remove d2/link1'])
2552.2.2 by Vincent Ladeuil
Enforce run_bzr(string) where possible.
510
1092.2.6 by Robert Collins
symlink support updated to work
511
            os.mkdir("d1")
2530.3.1 by Martin Pool
Cleanup old variations on run_bzr in the test suite
512
            self.run_bzr('add d1')
513
            self.run_bzr('rename d2/link3 d1/link3new')
2530.3.4 by Martin Pool
Deprecate run_bzr_captured in favour of just run_bzr
514
            self.assertEquals(self.run_bzr('unknowns')[0], 'd2/link1\n')
2552.2.2 by Vincent Ladeuil
Enforce run_bzr(string) where possible.
515
            self.run_bzr(['commit', '-m',
516
                          '8: remove d2/link1, move/rename link3'])
517
518
            self.run_bzr('check')
519
520
            self.run_bzr('export -r 1 exp1.tmp')
1092.2.6 by Robert Collins
symlink support updated to work
521
            chdir("exp1.tmp")
1185.16.145 by Martin Pool
Remove all assert statements from test cases.
522
            self.assertEquals(listdir_sorted("."), [ "link1" ])
523
            self.assertEquals(os.readlink("link1"), "NOWHERE1")
1092.2.6 by Robert Collins
symlink support updated to work
524
            chdir("..")
2552.2.2 by Vincent Ladeuil
Enforce run_bzr(string) where possible.
525
526
            self.run_bzr('export -r 2 exp2.tmp')
1092.2.6 by Robert Collins
symlink support updated to work
527
            chdir("exp2.tmp")
1185.16.145 by Martin Pool
Remove all assert statements from test cases.
528
            self.assertEquals(listdir_sorted("."), [ "d1", "link1" ])
1092.2.6 by Robert Collins
symlink support updated to work
529
            chdir("..")
2552.2.2 by Vincent Ladeuil
Enforce run_bzr(string) where possible.
530
531
            self.run_bzr('export -r 3 exp3.tmp')
1092.2.6 by Robert Collins
symlink support updated to work
532
            chdir("exp3.tmp")
1185.16.145 by Martin Pool
Remove all assert statements from test cases.
533
            self.assertEquals(listdir_sorted("."), [ "d2", "link2" ])
534
            self.assertEquals(listdir_sorted("d2"), [ "link1", "link3" ])
535
            self.assertEquals(os.readlink("d2/link1"), "NOWHERE1")
536
            self.assertEquals(os.readlink("link2")   , "NOWHERE2")
1092.2.6 by Robert Collins
symlink support updated to work
537
            chdir("..")
2552.2.2 by Vincent Ladeuil
Enforce run_bzr(string) where possible.
538
539
            self.run_bzr('export -r 4 exp4.tmp')
1092.2.6 by Robert Collins
symlink support updated to work
540
            chdir("exp4.tmp")
1185.16.145 by Martin Pool
Remove all assert statements from test cases.
541
            self.assertEquals(listdir_sorted("."), [ "d2", "link2" ])
542
            self.assertEquals(os.readlink("d2/link1"), "TARGET 1")
543
            self.assertEquals(os.readlink("link2")   , "TARGET 2")
544
            self.assertEquals(listdir_sorted("d2"), [ "link1", "link3" ])
1092.2.6 by Robert Collins
symlink support updated to work
545
            chdir("..")
2552.2.2 by Vincent Ladeuil
Enforce run_bzr(string) where possible.
546
547
            self.run_bzr('export -r 5 exp5.tmp')
1092.2.6 by Robert Collins
symlink support updated to work
548
            chdir("exp5.tmp")
1185.16.145 by Martin Pool
Remove all assert statements from test cases.
549
            self.assertEquals(listdir_sorted("."), [ "d2", "link2" ])
550
            self.assert_(os.path.islink("link2"))
551
            self.assert_(listdir_sorted("d2")== [ "link3" ])
1092.2.6 by Robert Collins
symlink support updated to work
552
            chdir("..")
2552.2.2 by Vincent Ladeuil
Enforce run_bzr(string) where possible.
553
554
            self.run_bzr('export -r 8 exp6.tmp')
1092.2.6 by Robert Collins
symlink support updated to work
555
            chdir("exp6.tmp")
1424 by Robert Collins
add rm alias to remove
556
            self.assertEqual(listdir_sorted("."), [ "d1", "d2", "link2"])
1185.16.145 by Martin Pool
Remove all assert statements from test cases.
557
            self.assertEquals(listdir_sorted("d1"), [ "link3new" ])
558
            self.assertEquals(listdir_sorted("d2"), [])
559
            self.assertEquals(os.readlink("d1/link3new"), "NOWHERE3")
1092.2.6 by Robert Collins
symlink support updated to work
560
            chdir("..")
561
        else:
562
            progress("skipping symlink tests")
1400.1.1 by Robert Collins
implement a basic test for the ui branch command from http servers
563
564
1524.1.1 by Robert Collins
Test sftp with relative, absolute-in-homedir and absolute-not-in-homedir
565
class RemoteTests(object):
1400.1.1 by Robert Collins
implement a basic test for the ui branch command from http servers
566
    """Test bzr ui commands against remote branches."""
567
568
    def test_branch(self):
569
        os.mkdir('from')
1534.4.50 by Robert Collins
Got the bzrdir api straightened out, plenty of refactoring to use it pending, but the api is up and running.
570
        wt = self.make_branch_and_tree('from')
1534.4.26 by Robert Collins
Move working tree initialisation out from Branch.initialize, deprecated Branch.initialize to Branch.create.
571
        branch = wt.branch
572
        wt.commit('empty commit for nonsense', allow_pointless=True)
1534.4.50 by Robert Collins
Got the bzrdir api straightened out, plenty of refactoring to use it pending, but the api is up and running.
573
        url = self.get_readonly_url('from')
2552.2.3 by Vincent Ladeuil
Deprecate the varargs syntax and fix the tests.
574
        self.run_bzr(['branch', url, 'to'])
1400.1.1 by Robert Collins
implement a basic test for the ui branch command from http servers
575
        branch = Branch.open('to')
576
        self.assertEqual(1, len(branch.revision_history()))
1534.4.50 by Robert Collins
Got the bzrdir api straightened out, plenty of refactoring to use it pending, but the api is up and running.
577
        # the branch should be set in to to from
578
        self.assertEqual(url + '/', branch.get_parent())
1185.16.48 by mbp at sourcefrog
- more refactoring of and tests for option parsing
579
1442.1.64 by Robert Collins
Branch.open_containing now returns a tuple (Branch, relative-path).
580
    def test_log(self):
581
        self.build_tree(['branch/', 'branch/file'])
2530.3.4 by Martin Pool
Deprecate run_bzr_captured in favour of just run_bzr
582
        self.run_bzr('init branch')[0]
583
        self.run_bzr('add branch/file')[0]
584
        self.run_bzr('commit -m foo branch')[0]
1534.4.50 by Robert Collins
Got the bzrdir api straightened out, plenty of refactoring to use it pending, but the api is up and running.
585
        url = self.get_readonly_url('branch/file')
2530.3.4 by Martin Pool
Deprecate run_bzr_captured in favour of just run_bzr
586
        output = self.run_bzr('log %s' % url)[0]
1185.35.17 by Aaron Bentley
Added branch nicks to long-format logs
587
        self.assertEqual(8, len(output.split('\n')))
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
588
1510 by Robert Collins
Merge from mpool, adjusting check to retain HTTP support.
589
    def test_check(self):
590
        self.build_tree(['branch/', 'branch/file'])
2530.3.4 by Martin Pool
Deprecate run_bzr_captured in favour of just run_bzr
591
        self.run_bzr('init branch')[0]
592
        self.run_bzr('add branch/file')[0]
593
        self.run_bzr('commit -m foo branch')[0]
1534.4.50 by Robert Collins
Got the bzrdir api straightened out, plenty of refactoring to use it pending, but the api is up and running.
594
        url = self.get_readonly_url('branch/')
2552.2.3 by Vincent Ladeuil
Deprecate the varargs syntax and fix the tests.
595
        self.run_bzr(['check', url])
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
596
1563.1.6 by Robert Collins
Add tests for sftp push, and NonLocalTets for BzrDir.create_branch_convenience, before fixing the failure of it to work on non-local urls.
597
    def test_push(self):
598
        # create a source branch
599
        os.mkdir('my-branch')
600
        os.chdir('my-branch')
601
        self.run_bzr('init')
602
        file('hello', 'wt').write('foo')
2552.2.3 by Vincent Ladeuil
Deprecate the varargs syntax and fix the tests.
603
        self.run_bzr('add hello')
604
        self.run_bzr('commit -m setup')
1563.1.6 by Robert Collins
Add tests for sftp push, and NonLocalTets for BzrDir.create_branch_convenience, before fixing the failure of it to work on non-local urls.
605
606
        # with an explicit target work
2552.2.3 by Vincent Ladeuil
Deprecate the varargs syntax and fix the tests.
607
        self.run_bzr(['push', self.get_url('output-branch')])
1563.1.6 by Robert Collins
Add tests for sftp push, and NonLocalTets for BzrDir.create_branch_convenience, before fixing the failure of it to work on non-local urls.
608
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
609
1524.1.1 by Robert Collins
Test sftp with relative, absolute-in-homedir and absolute-not-in-homedir
610
class HTTPTests(TestCaseWithWebserver, RemoteTests):
611
    """Test various commands against a HTTP server."""
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
612
613
1524.1.1 by Robert Collins
Test sftp with relative, absolute-in-homedir and absolute-not-in-homedir
614
class SFTPTestsAbsolute(TestCaseWithSFTPServer, RemoteTests):
615
    """Test various commands against a SFTP server using abs paths."""
616
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
617
1524.1.1 by Robert Collins
Test sftp with relative, absolute-in-homedir and absolute-not-in-homedir
618
class SFTPTestsAbsoluteSibling(TestCaseWithSFTPServer, RemoteTests):
619
    """Test various commands against a SFTP server using abs paths."""
620
621
    def setUp(self):
622
        super(SFTPTestsAbsoluteSibling, self).setUp()
623
        self._override_home = '/dev/noone/runs/tests/here'
624
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
625
1524.1.1 by Robert Collins
Test sftp with relative, absolute-in-homedir and absolute-not-in-homedir
626
class SFTPTestsRelative(TestCaseWithSFTPServer, RemoteTests):
627
    """Test various commands against a SFTP server using homedir rel paths."""
628
629
    def setUp(self):
630
        super(SFTPTestsRelative, self).setUp()
631
        self._get_remote_is_absolute = False