/brz/remove-bazaar

To get this branch, use:
bzr branch http://gegoxaren.bato24.eu/bzr/brz/remove-bazaar
720 by Martin Pool
- start moving external tests into the testsuite framework
1
# Copyright (C) 2005 by Canonical Ltd
736 by Martin Pool
- move old blackbox code from testbzr into bzrlib.selftest.blackbox
2
# -*- coding: utf-8 -*-
720 by Martin Pool
- start moving external tests into the testsuite framework
3
4
# This program is free software; you can redistribute it and/or modify
5
# it under the terms of the GNU General Public License as published by
6
# the Free Software Foundation; either version 2 of the License, or
7
# (at your option) any later version.
8
9
# This program is distributed in the hope that it will be useful,
10
# but WITHOUT ANY WARRANTY; without even the implied warranty of
11
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
12
# GNU General Public License for more details.
13
14
# You should have received a copy of the GNU General Public License
15
# along with this program; if not, write to the Free Software
16
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
17
18
19
"""Black-box tests for bzr.
20
21
These check that it behaves properly when it's invoked through the regular
22
command-line interface.
725 by Martin Pool
doc
23
24
This always reinvokes bzr through a new Python interpreter, which is a
25
bit inefficient but arguably tests in a way more representative of how
26
it's normally invoked.
720 by Martin Pool
- start moving external tests into the testsuite framework
27
"""
28
1185.1.25 by Robert Collins
merge David Clymer's patch for TestCaseInTestDir.runcmd
29
from cStringIO import StringIO
1185.1.41 by Robert Collins
massive patch from Alexander Belchenko - many PEP8 fixes, removes unused function uuid
30
import os
1185.10.1 by Aaron Bentley
Added --basis option to bzr branch
31
import shutil
974.1.26 by aaron.bentley at utoronto
merged mbp@sourcefrog.net-20050817233101-0939da1cf91f2472
32
import sys
974.1.71 by Aaron Bentley
Added test for pull
33
import os
1161 by Martin Pool
- add test that 'bzr add' reports the files as they're added
34
1141 by Martin Pool
- rename FunctionalTest to TestCaseInTempDir
35
from bzrlib.selftest import TestCaseInTempDir, BzrTestBase
1161 by Martin Pool
- add test that 'bzr add' reports the files as they're added
36
from bzrlib.branch import Branch
37
898 by Martin Pool
- add new runbzr method for external tests
38
1141 by Martin Pool
- rename FunctionalTest to TestCaseInTempDir
39
class ExternalBase(TestCaseInTempDir):
1185.1.31 by Robert Collins
Change the use of run_bzr to run_bzr_captured in blackbox tests - inspired by David Clymers patch to change run_bzr usage to runbzr
40
1185.3.23 by Martin Pool
- run some previously external tests in process
41
    def runbzr(self, args, retcode=0, backtick=False):
898 by Martin Pool
- add new runbzr method for external tests
42
        if isinstance(args, basestring):
43
            args = args.split()
1074 by Martin Pool
- check for email address in BRANCH_ROOT/.bzr/email, so you can
44
45
        if backtick:
1185.3.23 by Martin Pool
- run some previously external tests in process
46
            return self.run_bzr_captured(args, retcode=retcode)[0]
1074 by Martin Pool
- check for email address in BRANCH_ROOT/.bzr/email, so you can
47
        else:
1185.3.23 by Martin Pool
- run some previously external tests in process
48
            return self.run_bzr_captured(args, retcode=retcode)
904 by Martin Pool
- more selftest external-command fixes
49
1142 by Martin Pool
- remove dead code from blackbox tests (pychecker)
50
1102 by Martin Pool
- merge test refactoring from robertc
51
class TestCommands(ExternalBase):
52
53
    def test_help_commands(self):
898 by Martin Pool
- add new runbzr method for external tests
54
        self.runbzr('--help')
55
        self.runbzr('help')
56
        self.runbzr('help commands')
57
        self.runbzr('help help')
58
        self.runbzr('commit -h')
727 by Martin Pool
- move more code to run external commands from testbzr to selftest
59
1102 by Martin Pool
- merge test refactoring from robertc
60
    def test_init_branch(self):
898 by Martin Pool
- add new runbzr method for external tests
61
        self.runbzr(['init'])
732 by Martin Pool
- move more tests into bzr selftest
62
1102 by Martin Pool
- merge test refactoring from robertc
63
    def test_whoami(self):
732 by Martin Pool
- move more tests into bzr selftest
64
        # this should always identify something, if only "john@localhost"
898 by Martin Pool
- add new runbzr method for external tests
65
        self.runbzr("whoami")
66
        self.runbzr("whoami --email")
1074 by Martin Pool
- check for email address in BRANCH_ROOT/.bzr/email, so you can
67
68
        self.assertEquals(self.runbzr("whoami --email",
69
                                      backtick=True).count('@'), 1)
70
        
1102 by Martin Pool
- merge test refactoring from robertc
71
    def test_whoami_branch(self):
72
        """branch specific user identity works."""
1074 by Martin Pool
- check for email address in BRANCH_ROOT/.bzr/email, so you can
73
        self.runbzr('init')
74
        f = file('.bzr/email', 'wt')
75
        f.write('Branch Identity <branch@identi.ty>')
76
        f.close()
1185.6.1 by John Arbash Meinel
Updated the whomai test to handle BZREMAIL
77
        bzr_email = os.environ.get('BZREMAIL')
78
        if bzr_email is not None:
79
            del os.environ['BZREMAIL']
1074 by Martin Pool
- check for email address in BRANCH_ROOT/.bzr/email, so you can
80
        whoami = self.runbzr("whoami",backtick=True)
81
        whoami_email = self.runbzr("whoami --email",backtick=True)
82
        self.assertTrue(whoami.startswith('Branch Identity <branch@identi.ty>'))
83
        self.assertTrue(whoami_email.startswith('branch@identi.ty'))
1185.6.1 by John Arbash Meinel
Updated the whomai test to handle BZREMAIL
84
        # Verify that the environment variable overrides the value 
85
        # in the file
86
        os.environ['BZREMAIL'] = 'Different ID <other@environ.ment>'
87
        whoami = self.runbzr("whoami",backtick=True)
88
        whoami_email = self.runbzr("whoami --email",backtick=True)
89
        self.assertTrue(whoami.startswith('Different ID <other@environ.ment>'))
90
        self.assertTrue(whoami_email.startswith('other@environ.ment'))
91
        if bzr_email is not None:
92
            os.environ['BZREMAIL'] = bzr_email
736 by Martin Pool
- move old blackbox code from testbzr into bzrlib.selftest.blackbox
93
1102 by Martin Pool
- merge test refactoring from robertc
94
    def test_invalid_commands(self):
898 by Martin Pool
- add new runbzr method for external tests
95
        self.runbzr("pants", retcode=1)
96
        self.runbzr("--pants off", retcode=1)
97
        self.runbzr("diff --message foo", retcode=1)
736 by Martin Pool
- move old blackbox code from testbzr into bzrlib.selftest.blackbox
98
1102 by Martin Pool
- merge test refactoring from robertc
99
    def test_empty_commit(self):
898 by Martin Pool
- add new runbzr method for external tests
100
        self.runbzr("init")
885 by Martin Pool
- commit command refuses unless something is changed or --unchanged is given
101
        self.build_tree(['hello.txt'])
898 by Martin Pool
- add new runbzr method for external tests
102
        self.runbzr("commit -m empty", retcode=1)
103
        self.runbzr("add hello.txt")
104
        self.runbzr("commit -m added")
885 by Martin Pool
- commit command refuses unless something is changed or --unchanged is given
105
1102 by Martin Pool
- merge test refactoring from robertc
106
    def test_ignore_patterns(self):
906 by Martin Pool
- split out black-box ignore commands
107
        from bzrlib.branch import Branch
108
        
1185.11.5 by John Arbash Meinel
Merged up-to-date against mainline, still broken.
109
        b = Branch.initialize('.')
906 by Martin Pool
- split out black-box ignore commands
110
        self.assertEquals(list(b.unknowns()), [])
111
112
        file('foo.tmp', 'wt').write('tmp files are ignored')
113
        self.assertEquals(list(b.unknowns()), [])
1185.3.26 by Martin Pool
- remove remaining external executions of bzr
114
        assert self.capture('unknowns') == ''
906 by Martin Pool
- split out black-box ignore commands
115
116
        file('foo.c', 'wt').write('int main() {}')
117
        self.assertEquals(list(b.unknowns()), ['foo.c'])
1185.3.26 by Martin Pool
- remove remaining external executions of bzr
118
        assert self.capture('unknowns') == 'foo.c\n'
906 by Martin Pool
- split out black-box ignore commands
119
120
        self.runbzr(['add', 'foo.c'])
1185.3.26 by Martin Pool
- remove remaining external executions of bzr
121
        assert self.capture('unknowns') == ''
906 by Martin Pool
- split out black-box ignore commands
122
123
        # 'ignore' works when creating the .bzignore file
124
        file('foo.blah', 'wt').write('blah')
125
        self.assertEquals(list(b.unknowns()), ['foo.blah'])
126
        self.runbzr('ignore *.blah')
127
        self.assertEquals(list(b.unknowns()), [])
1185.1.41 by Robert Collins
massive patch from Alexander Belchenko - many PEP8 fixes, removes unused function uuid
128
        assert file('.bzrignore', 'rU').read() == '*.blah\n'
906 by Martin Pool
- split out black-box ignore commands
129
130
        # 'ignore' works when then .bzrignore file already exists
131
        file('garh', 'wt').write('garh')
132
        self.assertEquals(list(b.unknowns()), ['garh'])
1185.3.26 by Martin Pool
- remove remaining external executions of bzr
133
        assert self.capture('unknowns') == 'garh\n'
906 by Martin Pool
- split out black-box ignore commands
134
        self.runbzr('ignore garh')
135
        self.assertEquals(list(b.unknowns()), [])
1185.1.41 by Robert Collins
massive patch from Alexander Belchenko - many PEP8 fixes, removes unused function uuid
136
        assert file('.bzrignore', 'rU').read() == '*.blah\ngarh\n'
1102 by Martin Pool
- merge test refactoring from robertc
137
138
    def test_revert(self):
139
        self.runbzr('init')
140
141
        file('hello', 'wt').write('foo')
142
        self.runbzr('add hello')
143
        self.runbzr('commit -m setup hello')
144
145
        file('goodbye', 'wt').write('baz')
146
        self.runbzr('add goodbye')
147
        self.runbzr('commit -m setup goodbye')
1092.2.18 by Robert Collins
merge from symlink branch
148
1102 by Martin Pool
- merge test refactoring from robertc
149
        file('hello', 'wt').write('bar')
150
        file('goodbye', 'wt').write('qux')
151
        self.runbzr('revert hello')
152
        self.check_file_contents('hello', 'foo')
153
        self.check_file_contents('goodbye', 'qux')
154
        self.runbzr('revert')
155
        self.check_file_contents('goodbye', 'baz')
156
157
        os.mkdir('revertdir')
158
        self.runbzr('add revertdir')
159
        self.runbzr('commit -m f')
160
        os.rmdir('revertdir')
161
        self.runbzr('revert')
162
1092.2.18 by Robert Collins
merge from symlink branch
163
        os.symlink('/unlikely/to/exist', 'symlink')
164
        self.runbzr('add symlink')
165
        self.runbzr('commit -m f')
166
        os.unlink('symlink')
167
        self.runbzr('revert')
168
        
1185.5.8 by John Arbash Meinel
Fixed bzr revert with the new RevisionSpec code.
169
        file('hello', 'wt').write('xyz')
170
        self.runbzr('commit -m xyz hello')
171
        self.runbzr('revert -r 1 hello')
172
        self.check_file_contents('hello', 'foo')
173
        self.runbzr('revert hello')
174
        self.check_file_contents('hello', 'xyz')
1185.8.5 by Aaron Bentley
Fixed non-tree-root bug in branch, revert, merge
175
        os.chdir('revertdir')
176
        self.runbzr('revert')
177
        os.chdir('..')
178
1185.5.8 by John Arbash Meinel
Fixed bzr revert with the new RevisionSpec code.
179
1185.1.8 by Robert Collins
David Clymers patch to use rename rather than mv for two argument non-directory target bzr mv calls.
180
    def test_mv_modes(self):
1102 by Martin Pool
- merge test refactoring from robertc
181
        """Test two modes of operation for mv"""
182
        from bzrlib.branch import Branch
1185.11.5 by John Arbash Meinel
Merged up-to-date against mainline, still broken.
183
        b = Branch.initialize('.')
1102 by Martin Pool
- merge test refactoring from robertc
184
        self.build_tree(['a', 'c', 'subdir/'])
1185.1.31 by Robert Collins
Change the use of run_bzr to run_bzr_captured in blackbox tests - inspired by David Clymers patch to change run_bzr usage to runbzr
185
        self.run_bzr_captured(['add', self.test_dir])
186
        self.run_bzr_captured(['mv', 'a', 'b'])
187
        self.run_bzr_captured(['mv', 'b', 'subdir'])
188
        self.run_bzr_captured(['mv', 'subdir/b', 'a'])
189
        self.run_bzr_captured(['mv', 'a', 'c', 'subdir'])
190
        self.run_bzr_captured(['mv', 'subdir/a', 'subdir/newa'])
1102 by Martin Pool
- merge test refactoring from robertc
191
1185.1.8 by Robert Collins
David Clymers patch to use rename rather than mv for two argument non-directory target bzr mv calls.
192
1102 by Martin Pool
- merge test refactoring from robertc
193
    def test_main_version(self):
194
        """Check output from version command and master option is reasonable"""
195
        # output is intentionally passed through to stdout so that we
196
        # can see the version being tested
197
        output = self.runbzr('version', backtick=1)
198
        self.log('bzr version output:')
199
        self.log(output)
200
        self.assert_(output.startswith('bzr (bazaar-ng) '))
201
        self.assertNotEqual(output.index('Canonical'), -1)
202
        # make sure --version is consistent
203
        tmp_output = self.runbzr('--version', backtick=1)
204
        self.log('bzr --version output:')
205
        self.log(tmp_output)
206
        self.assertEquals(output, tmp_output)
906 by Martin Pool
- split out black-box ignore commands
207
1092.1.39 by Robert Collins
merge from mpool
208
    def example_branch(test):
209
        test.runbzr('init')
210
        file('hello', 'wt').write('foo')
211
        test.runbzr('add hello')
212
        test.runbzr('commit -m setup hello')
213
        file('goodbye', 'wt').write('baz')
214
        test.runbzr('add goodbye')
215
        test.runbzr('commit -m setup goodbye')
216
1185.12.1 by Aaron Bentley
Fixed export
217
    def test_export(self):
218
        os.mkdir('branch')
219
        os.chdir('branch')
220
        self.example_branch()
221
        self.runbzr('export ../latest')
222
        self.assertEqual(file('../latest/goodbye', 'rt').read(), 'baz')
223
        self.runbzr('export ../first -r 1')
224
        assert not os.path.exists('../first/goodbye')
225
        self.assertEqual(file('../first/hello', 'rt').read(), 'foo')
226
        self.runbzr('export ../first.gz -r 1')
227
        self.assertEqual(file('../first.gz/hello', 'rt').read(), 'foo')
228
        self.runbzr('export ../first.bz2 -r 1')
229
        self.assertEqual(file('../first.bz2/hello', 'rt').read(), 'foo')
230
        self.runbzr('export ../first.tar -r 1')
231
        assert os.path.isfile('../first.tar')
232
        from tarfile import TarFile
233
        tf = TarFile('../first.tar')
234
        assert 'first/hello' in tf.getnames(), tf.getnames()
235
        self.assertEqual(tf.extractfile('first/hello').read(), 'foo')
236
        self.runbzr('export ../first.tar.gz -r 1')
237
        assert os.path.isfile('../first.tar.gz')
238
        self.runbzr('export ../first.tbz2 -r 1')
239
        assert os.path.isfile('../first.tbz2')
240
        self.runbzr('export ../first.tar.bz2 -r 1')
241
        assert os.path.isfile('../first.tar.bz2')
242
        self.runbzr('export ../first.tar.tbz2 -r 1')
243
        assert os.path.isfile('../first.tar.tbz2')
244
        from bz2 import BZ2File
245
        tf = TarFile('../first.tar.tbz2', 
246
                     fileobj=BZ2File('../first.tar.tbz2', 'r'))
247
        assert 'first.tar/hello' in tf.getnames(), tf.getnames()
248
        self.assertEqual(tf.extractfile('first.tar/hello').read(), 'foo')
249
        self.runbzr('export ../first2.tar -r 1 --root pizza')
250
        tf = TarFile('../first2.tar')
251
        assert 'pizza/hello' in tf.getnames(), tf.getnames()
252
1185.4.1 by Lalo Martins
blackbox tests for diff
253
    def test_diff(self):
254
        self.example_branch()
255
        file('hello', 'wt').write('hello world!')
256
        self.runbzr('commit -m fixing hello')
257
        output = self.runbzr('diff -r 2..3', backtick=1)
258
        self.assert_('\n+hello world!' in output)
259
        output = self.runbzr('diff -r last:3..last:1', backtick=1)
260
        self.assert_('\n+baz' in output)
261
1185.8.4 by Aaron Bentley
Fixed branch -r
262
    def test_branch(self):
263
        """Branch from one branch to another."""
264
        os.mkdir('a')
265
        os.chdir('a')
266
        self.example_branch()
267
        os.chdir('..')
268
        self.runbzr('branch a b')
269
        self.runbzr('branch a c -r 1')
1185.10.1 by Aaron Bentley
Added --basis option to bzr branch
270
        os.chdir('b')
271
        self.runbzr('commit -m foo --unchanged')
272
        os.chdir('..')
1391 by Robert Collins
merge from integration
273
        # naughty - abstraction violations RBC 20050928  
1393 by Robert Collins
reenable remotebranch tests
274
        print "test_branch used to delete the stores, how is this meant to work ?"
275
        #shutil.rmtree('a/.bzr/revision-store')
276
        #shutil.rmtree('a/.bzr/inventory-store', ignore_errors=True)
277
        #shutil.rmtree('a/.bzr/text-store', ignore_errors=True)
1185.10.1 by Aaron Bentley
Added --basis option to bzr branch
278
        self.runbzr('branch a d --basis b')
1185.8.4 by Aaron Bentley
Fixed branch -r
279
1092.1.39 by Robert Collins
merge from mpool
280
    def test_merge(self):
281
        from bzrlib.branch import Branch
1139 by Martin Pool
- merge in merge improvements and additional tests
282
        
1092.1.39 by Robert Collins
merge from mpool
283
        os.mkdir('a')
284
        os.chdir('a')
285
        self.example_branch()
286
        os.chdir('..')
287
        self.runbzr('branch a b')
288
        os.chdir('b')
289
        file('goodbye', 'wt').write('quux')
290
        self.runbzr(['commit',  '-m',  "more u's are always good"])
291
292
        os.chdir('../a')
293
        file('hello', 'wt').write('quuux')
294
        # We can't merge when there are in-tree changes
295
        self.runbzr('merge ../b', retcode=1)
296
        self.runbzr(['commit', '-m', "Like an epidemic of u's"])
297
        self.runbzr('merge ../b')
298
        self.check_file_contents('goodbye', 'quux')
299
        # Merging a branch pulls its revision into the tree
1185.11.5 by John Arbash Meinel
Merged up-to-date against mainline, still broken.
300
        a = Branch.open('.')
301
        b = Branch.open('../b')
1241 by Martin Pool
- rename last_patch to last_revision
302
        a.get_revision_xml(b.last_revision())
1139 by Martin Pool
- merge in merge improvements and additional tests
303
        self.log('pending merges: %s', a.pending_merges())
1241 by Martin Pool
- rename last_patch to last_revision
304
        #        assert a.pending_merges() == [b.last_revision()], "Assertion %s %s" \
305
        #        % (a.pending_merges(), b.last_revision())
1161 by Martin Pool
- add test that 'bzr add' reports the files as they're added
306
1185.10.8 by Aaron Bentley
Conflict handling where OTHER is deleted
307
    def test_merge_with_missing_file(self):
308
        """Merge handles missing file conflicts"""
309
        os.mkdir('a')
310
        os.chdir('a')
311
        os.mkdir('sub')
312
        print >> file('sub/a.txt', 'wb'), "hello"
1185.10.10 by Aaron Bentley
Handled modified files missing from THIS
313
        print >> file('b.txt', 'wb'), "hello"
314
        print >> file('sub/c.txt', 'wb'), "hello"
1185.10.8 by Aaron Bentley
Conflict handling where OTHER is deleted
315
        self.runbzr('init')
316
        self.runbzr('add')
317
        self.runbzr(('commit', '-m', 'added a'))
318
        self.runbzr('branch . ../b')
319
        print >> file('sub/a.txt', 'ab'), "there"
1185.10.10 by Aaron Bentley
Handled modified files missing from THIS
320
        print >> file('b.txt', 'ab'), "there"
321
        print >> file('sub/c.txt', 'ab'), "there"
1185.10.8 by Aaron Bentley
Conflict handling where OTHER is deleted
322
        self.runbzr(('commit', '-m', 'Added there'))
323
        os.unlink('sub/a.txt')
1185.10.10 by Aaron Bentley
Handled modified files missing from THIS
324
        os.unlink('sub/c.txt')
1185.10.8 by Aaron Bentley
Conflict handling where OTHER is deleted
325
        os.rmdir('sub')
1185.10.10 by Aaron Bentley
Handled modified files missing from THIS
326
        os.unlink('b.txt')
1185.10.8 by Aaron Bentley
Conflict handling where OTHER is deleted
327
        self.runbzr(('commit', '-m', 'Removed a.txt'))
328
        os.chdir('../b')
329
        print >> file('sub/a.txt', 'ab'), "something"
1185.10.10 by Aaron Bentley
Handled modified files missing from THIS
330
        print >> file('b.txt', 'ab'), "something"
331
        print >> file('sub/c.txt', 'ab'), "something"
1185.10.8 by Aaron Bentley
Conflict handling where OTHER is deleted
332
        self.runbzr(('commit', '-m', 'Modified a.txt'))
333
        self.runbzr('merge ../a/')
334
        assert os.path.exists('sub/a.txt.THIS')
335
        assert os.path.exists('sub/a.txt.BASE')
1185.10.10 by Aaron Bentley
Handled modified files missing from THIS
336
        os.chdir('../a')
337
        self.runbzr('merge ../b/')
338
        assert os.path.exists('sub/a.txt.OTHER')
339
        assert os.path.exists('sub/a.txt.BASE')
1185.10.8 by Aaron Bentley
Conflict handling where OTHER is deleted
340
974.1.71 by Aaron Bentley
Added test for pull
341
    def test_pull(self):
342
        """Pull changes from one branch to another."""
343
        os.mkdir('a')
344
        os.chdir('a')
345
346
        self.example_branch()
974.1.79 by Aaron Bentley
Fixed issues with pull not having a default location after branch
347
        self.runbzr('pull', retcode=1)
348
        self.runbzr('missing', retcode=1)
349
        self.runbzr('missing .')
350
        self.runbzr('missing')
351
        self.runbzr('pull')
352
        self.runbzr('pull /', retcode=1)
353
        self.runbzr('pull')
354
974.1.71 by Aaron Bentley
Added test for pull
355
        os.chdir('..')
356
        self.runbzr('branch a b')
357
        os.chdir('b')
974.1.79 by Aaron Bentley
Fixed issues with pull not having a default location after branch
358
        self.runbzr('pull')
1185.8.5 by Aaron Bentley
Fixed non-tree-root bug in branch, revert, merge
359
        os.mkdir('subdir')
360
        self.runbzr('add subdir')
974.1.71 by Aaron Bentley
Added test for pull
361
        self.runbzr('commit -m blah --unchanged')
362
        os.chdir('../a')
1185.11.5 by John Arbash Meinel
Merged up-to-date against mainline, still broken.
363
        a = Branch.open('.')
364
        b = Branch.open('../b')
974.1.71 by Aaron Bentley
Added test for pull
365
        assert a.revision_history() == b.revision_history()[:-1]
366
        self.runbzr('pull ../b')
367
        assert a.revision_history() == b.revision_history()
368
        self.runbzr('commit -m blah2 --unchanged')
369
        os.chdir('../b')
370
        self.runbzr('commit -m blah3 --unchanged')
371
        self.runbzr('pull ../a', retcode=1)
1390 by Robert Collins
pair programming worx... merge integration and weave
372
        print "DECIDE IF PULL CAN CONVERGE, blackbox.py"
1391 by Robert Collins
merge from integration
373
        return
974.1.74 by Aaron Bentley
Made pull work after remote branch has merged latest revision
374
        os.chdir('../a')
375
        self.runbzr('merge ../b')
376
        self.runbzr('commit -m blah4 --unchanged')
1185.8.5 by Aaron Bentley
Fixed non-tree-root bug in branch, revert, merge
377
        os.chdir('../b/subdir')
378
        self.runbzr('pull ../../a')
974.1.74 by Aaron Bentley
Made pull work after remote branch has merged latest revision
379
        assert a.revision_history()[-1] == b.revision_history()[-1]
1185.10.7 by Aaron Bentley
Fixed bug where pull throws DivergedBranches if branch is newer than upstream
380
        self.runbzr('commit -m blah5 --unchanged')
381
        self.runbzr('commit -m blah6 --unchanged')
382
        os.chdir('..')
383
        self.runbzr('pull ../a')
384
        os.chdir('../a')
385
        self.runbzr('commit -m blah7 --unchanged')
386
        self.runbzr('merge ../b')
387
        self.runbzr('commit -m blah8 --unchanged')
388
        self.runbzr('pull ../b')
389
        self.runbzr('pull ../b')
974.1.74 by Aaron Bentley
Made pull work after remote branch has merged latest revision
390
        
1161 by Martin Pool
- add test that 'bzr add' reports the files as they're added
391
    def test_add_reports(self):
392
        """add command prints the names of added files."""
1185.11.5 by John Arbash Meinel
Merged up-to-date against mainline, still broken.
393
        b = Branch.initialize('.')
1161 by Martin Pool
- add test that 'bzr add' reports the files as they're added
394
        self.build_tree(['top.txt', 'dir/', 'dir/sub.txt'])
1185.1.31 by Robert Collins
Change the use of run_bzr to run_bzr_captured in blackbox tests - inspired by David Clymers patch to change run_bzr usage to runbzr
395
        out = self.run_bzr_captured(['add'], retcode = 0)[0]
1161 by Martin Pool
- add test that 'bzr add' reports the files as they're added
396
        # the ordering is not defined at the moment
1185.1.31 by Robert Collins
Change the use of run_bzr to run_bzr_captured in blackbox tests - inspired by David Clymers patch to change run_bzr usage to runbzr
397
        results = sorted(out.rstrip('\n').split('\n'))
1161 by Martin Pool
- add test that 'bzr add' reports the files as they're added
398
        self.assertEquals(['added dir',
1185.1.41 by Robert Collins
massive patch from Alexander Belchenko - many PEP8 fixes, removes unused function uuid
399
                           'added dir'+os.sep+'sub.txt',
1161 by Martin Pool
- add test that 'bzr add' reports the files as they're added
400
                           'added top.txt',],
401
                          results)
402
1185.3.20 by Martin Pool
- run_bzr_captured also includes logged errors in
403
    def test_unknown_command(self):
404
        """Handling of unknown command."""
405
        out, err = self.run_bzr_captured(['fluffy-badger'],
406
                                         retcode=1)
407
        self.assertEquals(out, '')
408
        err.index('unknown command')
409
        
410
1092.2.6 by Robert Collins
symlink support updated to work
411
412
def has_symlinks():
413
    if hasattr(os, 'symlink'):
414
        return True
415
    else:
416
        return False
417
418
def listdir_sorted(dir):
419
    L = os.listdir(dir)
420
    L.sort()
421
    return L
422
1092.2.12 by Robert Collins
merge from HEAD
423
904 by Martin Pool
- more selftest external-command fixes
424
class OldTests(ExternalBase):
1092.1.39 by Robert Collins
merge from mpool
425
    """old tests moved from ./testbzr."""
426
1102 by Martin Pool
- merge test refactoring from robertc
427
    def test_bzr(self):
736 by Martin Pool
- move old blackbox code from testbzr into bzrlib.selftest.blackbox
428
        from os import chdir, mkdir
429
        from os.path import exists
430
904 by Martin Pool
- more selftest external-command fixes
431
        runbzr = self.runbzr
1185.3.26 by Martin Pool
- remove remaining external executions of bzr
432
        capture = self.capture
736 by Martin Pool
- move old blackbox code from testbzr into bzrlib.selftest.blackbox
433
        progress = self.log
434
435
        progress("basic branch creation")
904 by Martin Pool
- more selftest external-command fixes
436
        mkdir('branch1')
736 by Martin Pool
- move old blackbox code from testbzr into bzrlib.selftest.blackbox
437
        chdir('branch1')
898 by Martin Pool
- add new runbzr method for external tests
438
        runbzr('init')
736 by Martin Pool
- move old blackbox code from testbzr into bzrlib.selftest.blackbox
439
1185.3.25 by Martin Pool
- run blackbox tests in-process
440
        self.assertEquals(capture('root').rstrip(),
736 by Martin Pool
- move old blackbox code from testbzr into bzrlib.selftest.blackbox
441
                          os.path.join(self.test_dir, 'branch1'))
442
443
        progress("status of new file")
444
445
        f = file('test.txt', 'wt')
446
        f.write('hello world!\n')
447
        f.close()
448
1185.3.25 by Martin Pool
- run blackbox tests in-process
449
        self.assertEquals(capture('unknowns'), 'test.txt\n')
736 by Martin Pool
- move old blackbox code from testbzr into bzrlib.selftest.blackbox
450
1185.3.25 by Martin Pool
- run blackbox tests in-process
451
        out = capture("status")
736 by Martin Pool
- move old blackbox code from testbzr into bzrlib.selftest.blackbox
452
        assert out == 'unknown:\n  test.txt\n'
453
1185.3.25 by Martin Pool
- run blackbox tests in-process
454
        out = capture("status --all")
736 by Martin Pool
- move old blackbox code from testbzr into bzrlib.selftest.blackbox
455
        assert out == "unknown:\n  test.txt\n"
456
1185.3.25 by Martin Pool
- run blackbox tests in-process
457
        out = capture("status test.txt --all")
736 by Martin Pool
- move old blackbox code from testbzr into bzrlib.selftest.blackbox
458
        assert out == "unknown:\n  test.txt\n"
459
460
        f = file('test2.txt', 'wt')
461
        f.write('goodbye cruel world...\n')
462
        f.close()
463
1185.3.25 by Martin Pool
- run blackbox tests in-process
464
        out = capture("status test.txt")
736 by Martin Pool
- move old blackbox code from testbzr into bzrlib.selftest.blackbox
465
        assert out == "unknown:\n  test.txt\n"
466
1185.3.25 by Martin Pool
- run blackbox tests in-process
467
        out = capture("status")
736 by Martin Pool
- move old blackbox code from testbzr into bzrlib.selftest.blackbox
468
        assert out == ("unknown:\n"
469
                       "  test.txt\n"
470
                       "  test2.txt\n")
471
472
        os.unlink('test2.txt')
473
474
        progress("command aliases")
1185.3.25 by Martin Pool
- run blackbox tests in-process
475
        out = capture("st --all")
736 by Martin Pool
- move old blackbox code from testbzr into bzrlib.selftest.blackbox
476
        assert out == ("unknown:\n"
477
                       "  test.txt\n")
478
1185.3.25 by Martin Pool
- run blackbox tests in-process
479
        out = capture("stat")
736 by Martin Pool
- move old blackbox code from testbzr into bzrlib.selftest.blackbox
480
        assert out == ("unknown:\n"
481
                       "  test.txt\n")
482
483
        progress("command help")
898 by Martin Pool
- add new runbzr method for external tests
484
        runbzr("help st")
485
        runbzr("help")
486
        runbzr("help commands")
487
        runbzr("help slartibartfast", 1)
736 by Martin Pool
- move old blackbox code from testbzr into bzrlib.selftest.blackbox
488
1185.3.25 by Martin Pool
- run blackbox tests in-process
489
        out = capture("help ci")
736 by Martin Pool
- move old blackbox code from testbzr into bzrlib.selftest.blackbox
490
        out.index('aliases: ')
491
492
        progress("can't rename unversioned file")
898 by Martin Pool
- add new runbzr method for external tests
493
        runbzr("rename test.txt new-test.txt", 1)
736 by Martin Pool
- move old blackbox code from testbzr into bzrlib.selftest.blackbox
494
495
        progress("adding a file")
496
898 by Martin Pool
- add new runbzr method for external tests
497
        runbzr("add test.txt")
1185.3.25 by Martin Pool
- run blackbox tests in-process
498
        assert capture("unknowns") == ''
499
        assert capture("status --all") == ("added:\n"
736 by Martin Pool
- move old blackbox code from testbzr into bzrlib.selftest.blackbox
500
                                                "  test.txt\n")
501
502
        progress("rename newly-added file")
898 by Martin Pool
- add new runbzr method for external tests
503
        runbzr("rename test.txt hello.txt")
736 by Martin Pool
- move old blackbox code from testbzr into bzrlib.selftest.blackbox
504
        assert os.path.exists("hello.txt")
505
        assert not os.path.exists("test.txt")
506
1185.3.25 by Martin Pool
- run blackbox tests in-process
507
        assert capture("revno") == '0\n'
736 by Martin Pool
- move old blackbox code from testbzr into bzrlib.selftest.blackbox
508
509
        progress("add first revision")
904 by Martin Pool
- more selftest external-command fixes
510
        runbzr(['commit', '-m', 'add first revision'])
736 by Martin Pool
- move old blackbox code from testbzr into bzrlib.selftest.blackbox
511
512
        progress("more complex renames")
513
        os.mkdir("sub1")
898 by Martin Pool
- add new runbzr method for external tests
514
        runbzr("rename hello.txt sub1", 1)
515
        runbzr("rename hello.txt sub1/hello.txt", 1)
516
        runbzr("move hello.txt sub1", 1)
736 by Martin Pool
- move old blackbox code from testbzr into bzrlib.selftest.blackbox
517
898 by Martin Pool
- add new runbzr method for external tests
518
        runbzr("add sub1")
519
        runbzr("rename sub1 sub2")
520
        runbzr("move hello.txt sub2")
1185.3.25 by Martin Pool
- run blackbox tests in-process
521
        assert capture("relpath sub2/hello.txt") == os.path.join("sub2", "hello.txt\n")
736 by Martin Pool
- move old blackbox code from testbzr into bzrlib.selftest.blackbox
522
523
        assert exists("sub2")
524
        assert exists("sub2/hello.txt")
525
        assert not exists("sub1")
526
        assert not exists("hello.txt")
527
898 by Martin Pool
- add new runbzr method for external tests
528
        runbzr(['commit', '-m', 'commit with some things moved to subdirs'])
736 by Martin Pool
- move old blackbox code from testbzr into bzrlib.selftest.blackbox
529
530
        mkdir("sub1")
898 by Martin Pool
- add new runbzr method for external tests
531
        runbzr('add sub1')
532
        runbzr('move sub2/hello.txt sub1')
736 by Martin Pool
- move old blackbox code from testbzr into bzrlib.selftest.blackbox
533
        assert not exists('sub2/hello.txt')
534
        assert exists('sub1/hello.txt')
898 by Martin Pool
- add new runbzr method for external tests
535
        runbzr('move sub2 sub1')
736 by Martin Pool
- move old blackbox code from testbzr into bzrlib.selftest.blackbox
536
        assert not exists('sub2')
537
        assert exists('sub1/sub2')
538
898 by Martin Pool
- add new runbzr method for external tests
539
        runbzr(['commit', '-m', 'rename nested subdirectories'])
736 by Martin Pool
- move old blackbox code from testbzr into bzrlib.selftest.blackbox
540
541
        chdir('sub1/sub2')
1185.3.25 by Martin Pool
- run blackbox tests in-process
542
        self.assertEquals(capture('root')[:-1],
736 by Martin Pool
- move old blackbox code from testbzr into bzrlib.selftest.blackbox
543
                          os.path.join(self.test_dir, 'branch1'))
898 by Martin Pool
- add new runbzr method for external tests
544
        runbzr('move ../hello.txt .')
736 by Martin Pool
- move old blackbox code from testbzr into bzrlib.selftest.blackbox
545
        assert exists('./hello.txt')
1185.3.25 by Martin Pool
- run blackbox tests in-process
546
        self.assertEquals(capture('relpath hello.txt'),
547
                          os.path.join('sub1', 'sub2', 'hello.txt') + '\n')
548
        assert capture('relpath ../../sub1/sub2/hello.txt') == os.path.join('sub1', 'sub2', 'hello.txt\n')
898 by Martin Pool
- add new runbzr method for external tests
549
        runbzr(['commit', '-m', 'move to parent directory'])
736 by Martin Pool
- move old blackbox code from testbzr into bzrlib.selftest.blackbox
550
        chdir('..')
1185.3.25 by Martin Pool
- run blackbox tests in-process
551
        assert capture('relpath sub2/hello.txt') == os.path.join('sub1', 'sub2', 'hello.txt\n')
736 by Martin Pool
- move old blackbox code from testbzr into bzrlib.selftest.blackbox
552
898 by Martin Pool
- add new runbzr method for external tests
553
        runbzr('move sub2/hello.txt .')
736 by Martin Pool
- move old blackbox code from testbzr into bzrlib.selftest.blackbox
554
        assert exists('hello.txt')
555
556
        f = file('hello.txt', 'wt')
557
        f.write('some nice new content\n')
558
        f.close()
559
560
        f = file('msg.tmp', 'wt')
561
        f.write('this is my new commit\n')
562
        f.close()
563
898 by Martin Pool
- add new runbzr method for external tests
564
        runbzr('commit -F msg.tmp')
736 by Martin Pool
- move old blackbox code from testbzr into bzrlib.selftest.blackbox
565
1185.3.25 by Martin Pool
- run blackbox tests in-process
566
        assert capture('revno') == '5\n'
898 by Martin Pool
- add new runbzr method for external tests
567
        runbzr('export -r 5 export-5.tmp')
568
        runbzr('export export.tmp')
736 by Martin Pool
- move old blackbox code from testbzr into bzrlib.selftest.blackbox
569
898 by Martin Pool
- add new runbzr method for external tests
570
        runbzr('log')
571
        runbzr('log -v')
909.1.5 by Aaron Bentley
Fixed log -v (mostly)
572
        runbzr('log -v --forward')
573
        runbzr('log -m', retcode=1)
1185.3.25 by Martin Pool
- run blackbox tests in-process
574
        log_out = capture('log -m commit')
909.1.5 by Aaron Bentley
Fixed log -v (mostly)
575
        assert "this is my new commit" in log_out
576
        assert "rename nested" not in log_out
577
        assert 'revision-id' not in log_out
1185.3.25 by Martin Pool
- run blackbox tests in-process
578
        assert 'revision-id' in capture('log --show-ids -m commit')
736 by Martin Pool
- move old blackbox code from testbzr into bzrlib.selftest.blackbox
579
580
581
        progress("file with spaces in name")
582
        mkdir('sub directory')
583
        file('sub directory/file with spaces ', 'wt').write('see how this works\n')
898 by Martin Pool
- add new runbzr method for external tests
584
        runbzr('add .')
585
        runbzr('diff')
586
        runbzr('commit -m add-spaces')
587
        runbzr('check')
588
589
        runbzr('log')
590
        runbzr('log --forward')
591
592
        runbzr('info')
1092.1.35 by Robert Collins
merge from mpool up to rev 1110
593
1092.2.6 by Robert Collins
symlink support updated to work
594
        if has_symlinks():
595
            progress("symlinks")
596
            mkdir('symlinks')
597
            chdir('symlinks')
598
            runbzr('init')
599
            os.symlink("NOWHERE1", "link1")
600
            runbzr('add link1')
1092.3.4 by Robert Collins
update symlink branch to integration
601
            assert self.capture('unknowns') == ''
1092.2.6 by Robert Collins
symlink support updated to work
602
            runbzr(['commit', '-m', '1: added symlink link1'])
603
    
604
            mkdir('d1')
605
            runbzr('add d1')
1092.3.4 by Robert Collins
update symlink branch to integration
606
            assert self.capture('unknowns') == ''
1092.2.6 by Robert Collins
symlink support updated to work
607
            os.symlink("NOWHERE2", "d1/link2")
1092.3.4 by Robert Collins
update symlink branch to integration
608
            assert self.capture('unknowns') == 'd1/link2\n'
1092.2.6 by Robert Collins
symlink support updated to work
609
            # is d1/link2 found when adding d1
610
            runbzr('add d1')
1092.3.4 by Robert Collins
update symlink branch to integration
611
            assert self.capture('unknowns') == ''
1092.2.6 by Robert Collins
symlink support updated to work
612
            os.symlink("NOWHERE3", "d1/link3")
1092.3.4 by Robert Collins
update symlink branch to integration
613
            assert self.capture('unknowns') == 'd1/link3\n'
1092.2.6 by Robert Collins
symlink support updated to work
614
            runbzr(['commit', '-m', '2: added dir, symlink'])
615
    
616
            runbzr('rename d1 d2')
617
            runbzr('move d2/link2 .')
618
            runbzr('move link1 d2')
619
            assert os.readlink("./link2") == "NOWHERE2"
620
            assert os.readlink("d2/link1") == "NOWHERE1"
621
            runbzr('add d2/link3')
622
            runbzr('diff')
623
            runbzr(['commit', '-m', '3: rename of dir, move symlinks, add link3'])
624
    
625
            os.unlink("link2")
626
            os.symlink("TARGET 2", "link2")
627
            os.unlink("d2/link1")
628
            os.symlink("TARGET 1", "d2/link1")
629
            runbzr('diff')
1092.3.4 by Robert Collins
update symlink branch to integration
630
            assert self.capture("relpath d2/link1") == "d2/link1\n"
1092.2.6 by Robert Collins
symlink support updated to work
631
            runbzr(['commit', '-m', '4: retarget of two links'])
632
    
633
            runbzr('remove d2/link1')
1092.3.4 by Robert Collins
update symlink branch to integration
634
            assert self.capture('unknowns') == 'd2/link1\n'
1092.2.20 by Robert Collins
symlink and weaves, whaddya know
635
            runbzr(['commit', '-m', '5: remove d2/link1'])
1092.2.6 by Robert Collins
symlink support updated to work
636
    
637
            os.mkdir("d1")
638
            runbzr('add d1')
639
            runbzr('rename d2/link3 d1/link3new')
1092.3.4 by Robert Collins
update symlink branch to integration
640
            assert self.capture('unknowns') == 'd2/link1\n'
1092.2.6 by Robert Collins
symlink support updated to work
641
            runbzr(['commit', '-m', '6: remove d2/link1, move/rename link3'])
642
            
643
            runbzr(['check'])
644
            
645
            runbzr(['export', '-r', '1', 'exp1.tmp'])
646
            chdir("exp1.tmp")
647
            assert listdir_sorted(".") == [ "link1" ]
648
            assert os.readlink("link1") == "NOWHERE1"
649
            chdir("..")
650
            
651
            runbzr(['export', '-r', '2', 'exp2.tmp'])
652
            chdir("exp2.tmp")
653
            assert listdir_sorted(".") == [ "d1", "link1" ]
654
            chdir("..")
655
            
656
            runbzr(['export', '-r', '3', 'exp3.tmp'])
657
            chdir("exp3.tmp")
658
            assert listdir_sorted(".") == [ "d2", "link2" ]
659
            assert listdir_sorted("d2") == [ "link1", "link3" ]
660
            assert os.readlink("d2/link1") == "NOWHERE1"
661
            assert os.readlink("link2")    == "NOWHERE2"
662
            chdir("..")
663
            
664
            runbzr(['export', '-r', '4', 'exp4.tmp'])
665
            chdir("exp4.tmp")
666
            assert listdir_sorted(".") == [ "d2", "link2" ]
667
            assert os.readlink("d2/link1") == "TARGET 1"
668
            assert os.readlink("link2")    == "TARGET 2"
669
            assert listdir_sorted("d2") == [ "link1", "link3" ]
670
            chdir("..")
671
            
672
            runbzr(['export', '-r', '5', 'exp5.tmp'])
673
            chdir("exp5.tmp")
674
            assert listdir_sorted(".") == [ "d2", "link2" ]
675
            assert os.path.islink("link2")
676
            assert listdir_sorted("d2")== [ "link3" ]
677
            chdir("..")
678
            
679
            runbzr(['export', '-r', '6', 'exp6.tmp'])
680
            chdir("exp6.tmp")
681
            assert listdir_sorted(".") == [ "d1", "d2", "link2" ]
682
            assert listdir_sorted("d1") == [ "link3new" ]
683
            assert listdir_sorted("d2") == []
684
            assert os.readlink("d1/link3new") == "NOWHERE3"
685
            chdir("..")
686
        else:
687
            progress("skipping symlink tests")
688