/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
1403 by Robert Collins
merge from martin
22
command-line interface. This doesn't actually run a new interpreter but 
1393.1.45 by Martin Pool
doc
23
rather starts again from the run_bzr function.
720 by Martin Pool
- start moving external tests into the testsuite framework
24
"""
25
1393.1.45 by Martin Pool
doc
26
1185.1.25 by Robert Collins
merge David Clymer's patch for TestCaseInTestDir.runcmd
27
from cStringIO import StringIO
1185.1.41 by Robert Collins
massive patch from Alexander Belchenko - many PEP8 fixes, removes unused function uuid
28
import os
1185.16.43 by Martin Pool
- clean up handling of option objects
29
import re
1185.10.1 by Aaron Bentley
Added --basis option to bzr branch
30
import shutil
974.1.26 by aaron.bentley at utoronto
merged mbp@sourcefrog.net-20050817233101-0939da1cf91f2472
31
import sys
1161 by Martin Pool
- add test that 'bzr add' reports the files as they're added
32
33
from bzrlib.branch import Branch
1432 by Robert Collins
branch: namespace
34
from bzrlib.clone import copy_branch
1393.3.3 by Jelmer Vernooij
Add test for empty commit messages.
35
from bzrlib.errors import BzrCommandError
1399.1.4 by Robert Collins
move diff and symlink conditionals into inventory.py from diff.py
36
from bzrlib.osutils import has_symlinks
1414 by Robert Collins
merge in an adjusted version of Jelmer's empty-log detection patch.
37
from bzrlib.selftest import TestCaseInTempDir, BzrTestBase
1400.1.1 by Robert Collins
implement a basic test for the ui branch command from http servers
38
from bzrlib.selftest.HTTPTestUtil import TestCaseWithWebserver
1161 by Martin Pool
- add test that 'bzr add' reports the files as they're added
39
898 by Martin Pool
- add new runbzr method for external tests
40
1141 by Martin Pool
- rename FunctionalTest to TestCaseInTempDir
41
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
42
1185.3.23 by Martin Pool
- run some previously external tests in process
43
    def runbzr(self, args, retcode=0, backtick=False):
898 by Martin Pool
- add new runbzr method for external tests
44
        if isinstance(args, basestring):
45
            args = args.split()
1074 by Martin Pool
- check for email address in BRANCH_ROOT/.bzr/email, so you can
46
47
        if backtick:
1185.3.23 by Martin Pool
- run some previously external tests in process
48
            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
49
        else:
1185.3.23 by Martin Pool
- run some previously external tests in process
50
            return self.run_bzr_captured(args, retcode=retcode)
904 by Martin Pool
- more selftest external-command fixes
51
1142 by Martin Pool
- remove dead code from blackbox tests (pychecker)
52
1102 by Martin Pool
- merge test refactoring from robertc
53
class TestCommands(ExternalBase):
54
55
    def test_help_commands(self):
898 by Martin Pool
- add new runbzr method for external tests
56
        self.runbzr('--help')
57
        self.runbzr('help')
58
        self.runbzr('help commands')
59
        self.runbzr('help help')
60
        self.runbzr('commit -h')
727 by Martin Pool
- move more code to run external commands from testbzr to selftest
61
1102 by Martin Pool
- merge test refactoring from robertc
62
    def test_init_branch(self):
898 by Martin Pool
- add new runbzr method for external tests
63
        self.runbzr(['init'])
732 by Martin Pool
- move more tests into bzr selftest
64
1102 by Martin Pool
- merge test refactoring from robertc
65
    def test_whoami(self):
732 by Martin Pool
- move more tests into bzr selftest
66
        # this should always identify something, if only "john@localhost"
898 by Martin Pool
- add new runbzr method for external tests
67
        self.runbzr("whoami")
68
        self.runbzr("whoami --email")
1074 by Martin Pool
- check for email address in BRANCH_ROOT/.bzr/email, so you can
69
70
        self.assertEquals(self.runbzr("whoami --email",
71
                                      backtick=True).count('@'), 1)
72
        
1102 by Martin Pool
- merge test refactoring from robertc
73
    def test_whoami_branch(self):
74
        """branch specific user identity works."""
1074 by Martin Pool
- check for email address in BRANCH_ROOT/.bzr/email, so you can
75
        self.runbzr('init')
76
        f = file('.bzr/email', 'wt')
77
        f.write('Branch Identity <branch@identi.ty>')
78
        f.close()
1185.6.1 by John Arbash Meinel
Updated the whomai test to handle BZREMAIL
79
        bzr_email = os.environ.get('BZREMAIL')
80
        if bzr_email is not None:
81
            del os.environ['BZREMAIL']
1074 by Martin Pool
- check for email address in BRANCH_ROOT/.bzr/email, so you can
82
        whoami = self.runbzr("whoami",backtick=True)
83
        whoami_email = self.runbzr("whoami --email",backtick=True)
84
        self.assertTrue(whoami.startswith('Branch Identity <branch@identi.ty>'))
85
        self.assertTrue(whoami_email.startswith('branch@identi.ty'))
1185.6.1 by John Arbash Meinel
Updated the whomai test to handle BZREMAIL
86
        # Verify that the environment variable overrides the value 
87
        # in the file
88
        os.environ['BZREMAIL'] = 'Different ID <other@environ.ment>'
89
        whoami = self.runbzr("whoami",backtick=True)
90
        whoami_email = self.runbzr("whoami --email",backtick=True)
91
        self.assertTrue(whoami.startswith('Different ID <other@environ.ment>'))
92
        self.assertTrue(whoami_email.startswith('other@environ.ment'))
93
        if bzr_email is not None:
94
            os.environ['BZREMAIL'] = bzr_email
736 by Martin Pool
- move old blackbox code from testbzr into bzrlib.selftest.blackbox
95
1102 by Martin Pool
- merge test refactoring from robertc
96
    def test_invalid_commands(self):
898 by Martin Pool
- add new runbzr method for external tests
97
        self.runbzr("pants", retcode=1)
98
        self.runbzr("--pants off", retcode=1)
99
        self.runbzr("diff --message foo", retcode=1)
736 by Martin Pool
- move old blackbox code from testbzr into bzrlib.selftest.blackbox
100
1102 by Martin Pool
- merge test refactoring from robertc
101
    def test_empty_commit(self):
898 by Martin Pool
- add new runbzr method for external tests
102
        self.runbzr("init")
885 by Martin Pool
- commit command refuses unless something is changed or --unchanged is given
103
        self.build_tree(['hello.txt'])
898 by Martin Pool
- add new runbzr method for external tests
104
        self.runbzr("commit -m empty", retcode=1)
105
        self.runbzr("add hello.txt")
106
        self.runbzr("commit -m added")
885 by Martin Pool
- commit command refuses unless something is changed or --unchanged is given
107
1393.3.3 by Jelmer Vernooij
Add test for empty commit messages.
108
    def test_empty_commit_message(self):
109
        self.runbzr("init")
110
        file('foo.c', 'wt').write('int main() {}')
111
        self.runbzr(['add', 'foo.c'])
1414 by Robert Collins
merge in an adjusted version of Jelmer's empty-log detection patch.
112
        self.runbzr(["commit", "-m", ""] , retcode=1) 
1393.3.3 by Jelmer Vernooij
Add test for empty commit messages.
113
1102 by Martin Pool
- merge test refactoring from robertc
114
    def test_ignore_patterns(self):
906 by Martin Pool
- split out black-box ignore commands
115
        from bzrlib.branch import Branch
116
        
1185.11.5 by John Arbash Meinel
Merged up-to-date against mainline, still broken.
117
        b = Branch.initialize('.')
906 by Martin Pool
- split out black-box ignore commands
118
        self.assertEquals(list(b.unknowns()), [])
119
120
        file('foo.tmp', 'wt').write('tmp files are ignored')
121
        self.assertEquals(list(b.unknowns()), [])
1185.3.26 by Martin Pool
- remove remaining external executions of bzr
122
        assert self.capture('unknowns') == ''
906 by Martin Pool
- split out black-box ignore commands
123
124
        file('foo.c', 'wt').write('int main() {}')
125
        self.assertEquals(list(b.unknowns()), ['foo.c'])
1185.3.26 by Martin Pool
- remove remaining external executions of bzr
126
        assert self.capture('unknowns') == 'foo.c\n'
906 by Martin Pool
- split out black-box ignore commands
127
128
        self.runbzr(['add', 'foo.c'])
1185.3.26 by Martin Pool
- remove remaining external executions of bzr
129
        assert self.capture('unknowns') == ''
906 by Martin Pool
- split out black-box ignore commands
130
131
        # 'ignore' works when creating the .bzignore file
132
        file('foo.blah', 'wt').write('blah')
133
        self.assertEquals(list(b.unknowns()), ['foo.blah'])
134
        self.runbzr('ignore *.blah')
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\n'
906 by Martin Pool
- split out black-box ignore commands
137
138
        # 'ignore' works when then .bzrignore file already exists
139
        file('garh', 'wt').write('garh')
140
        self.assertEquals(list(b.unknowns()), ['garh'])
1185.3.26 by Martin Pool
- remove remaining external executions of bzr
141
        assert self.capture('unknowns') == 'garh\n'
906 by Martin Pool
- split out black-box ignore commands
142
        self.runbzr('ignore garh')
143
        self.assertEquals(list(b.unknowns()), [])
1185.1.41 by Robert Collins
massive patch from Alexander Belchenko - many PEP8 fixes, removes unused function uuid
144
        assert file('.bzrignore', 'rU').read() == '*.blah\ngarh\n'
1102 by Martin Pool
- merge test refactoring from robertc
145
146
    def test_revert(self):
147
        self.runbzr('init')
148
149
        file('hello', 'wt').write('foo')
150
        self.runbzr('add hello')
151
        self.runbzr('commit -m setup hello')
152
153
        file('goodbye', 'wt').write('baz')
154
        self.runbzr('add goodbye')
155
        self.runbzr('commit -m setup goodbye')
1092.2.18 by Robert Collins
merge from symlink branch
156
1102 by Martin Pool
- merge test refactoring from robertc
157
        file('hello', 'wt').write('bar')
158
        file('goodbye', 'wt').write('qux')
159
        self.runbzr('revert hello')
160
        self.check_file_contents('hello', 'foo')
161
        self.check_file_contents('goodbye', 'qux')
162
        self.runbzr('revert')
163
        self.check_file_contents('goodbye', 'baz')
164
165
        os.mkdir('revertdir')
166
        self.runbzr('add revertdir')
167
        self.runbzr('commit -m f')
168
        os.rmdir('revertdir')
169
        self.runbzr('revert')
170
1092.2.18 by Robert Collins
merge from symlink branch
171
        os.symlink('/unlikely/to/exist', 'symlink')
172
        self.runbzr('add symlink')
173
        self.runbzr('commit -m f')
174
        os.unlink('symlink')
175
        self.runbzr('revert')
1448 by Robert Collins
revert symlinks correctly
176
        self.failUnlessExists('symlink')
177
        os.unlink('symlink')
178
        os.symlink('a-different-path', 'symlink')
179
        self.runbzr('revert')
180
        self.assertEqual('/unlikely/to/exist',
181
                         os.readlink('symlink'))
1092.2.18 by Robert Collins
merge from symlink branch
182
        
1185.5.8 by John Arbash Meinel
Fixed bzr revert with the new RevisionSpec code.
183
        file('hello', 'wt').write('xyz')
184
        self.runbzr('commit -m xyz hello')
185
        self.runbzr('revert -r 1 hello')
186
        self.check_file_contents('hello', 'foo')
187
        self.runbzr('revert hello')
188
        self.check_file_contents('hello', 'xyz')
1185.8.5 by Aaron Bentley
Fixed non-tree-root bug in branch, revert, merge
189
        os.chdir('revertdir')
190
        self.runbzr('revert')
191
        os.chdir('..')
192
1185.5.8 by John Arbash Meinel
Fixed bzr revert with the new RevisionSpec code.
193
1185.1.8 by Robert Collins
David Clymers patch to use rename rather than mv for two argument non-directory target bzr mv calls.
194
    def test_mv_modes(self):
1102 by Martin Pool
- merge test refactoring from robertc
195
        """Test two modes of operation for mv"""
196
        from bzrlib.branch import Branch
1185.11.5 by John Arbash Meinel
Merged up-to-date against mainline, still broken.
197
        b = Branch.initialize('.')
1102 by Martin Pool
- merge test refactoring from robertc
198
        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
199
        self.run_bzr_captured(['add', self.test_dir])
200
        self.run_bzr_captured(['mv', 'a', 'b'])
201
        self.run_bzr_captured(['mv', 'b', 'subdir'])
202
        self.run_bzr_captured(['mv', 'subdir/b', 'a'])
203
        self.run_bzr_captured(['mv', 'a', 'c', 'subdir'])
204
        self.run_bzr_captured(['mv', 'subdir/a', 'subdir/newa'])
1102 by Martin Pool
- merge test refactoring from robertc
205
206
    def test_main_version(self):
207
        """Check output from version command and master option is reasonable"""
208
        # output is intentionally passed through to stdout so that we
209
        # can see the version being tested
210
        output = self.runbzr('version', backtick=1)
211
        self.log('bzr version output:')
212
        self.log(output)
213
        self.assert_(output.startswith('bzr (bazaar-ng) '))
214
        self.assertNotEqual(output.index('Canonical'), -1)
215
        # make sure --version is consistent
216
        tmp_output = self.runbzr('--version', backtick=1)
217
        self.log('bzr --version output:')
218
        self.log(tmp_output)
219
        self.assertEquals(output, tmp_output)
906 by Martin Pool
- split out black-box ignore commands
220
1092.1.39 by Robert Collins
merge from mpool
221
    def example_branch(test):
222
        test.runbzr('init')
223
        file('hello', 'wt').write('foo')
224
        test.runbzr('add hello')
225
        test.runbzr('commit -m setup hello')
226
        file('goodbye', 'wt').write('baz')
227
        test.runbzr('add goodbye')
228
        test.runbzr('commit -m setup goodbye')
229
1185.12.1 by Aaron Bentley
Fixed export
230
    def test_export(self):
231
        os.mkdir('branch')
232
        os.chdir('branch')
233
        self.example_branch()
234
        self.runbzr('export ../latest')
235
        self.assertEqual(file('../latest/goodbye', 'rt').read(), 'baz')
236
        self.runbzr('export ../first -r 1')
237
        assert not os.path.exists('../first/goodbye')
238
        self.assertEqual(file('../first/hello', 'rt').read(), 'foo')
239
        self.runbzr('export ../first.gz -r 1')
240
        self.assertEqual(file('../first.gz/hello', 'rt').read(), 'foo')
241
        self.runbzr('export ../first.bz2 -r 1')
242
        self.assertEqual(file('../first.bz2/hello', 'rt').read(), 'foo')
243
        self.runbzr('export ../first.tar -r 1')
244
        assert os.path.isfile('../first.tar')
245
        from tarfile import TarFile
246
        tf = TarFile('../first.tar')
247
        assert 'first/hello' in tf.getnames(), tf.getnames()
248
        self.assertEqual(tf.extractfile('first/hello').read(), 'foo')
249
        self.runbzr('export ../first.tar.gz -r 1')
250
        assert os.path.isfile('../first.tar.gz')
251
        self.runbzr('export ../first.tbz2 -r 1')
252
        assert os.path.isfile('../first.tbz2')
253
        self.runbzr('export ../first.tar.bz2 -r 1')
254
        assert os.path.isfile('../first.tar.bz2')
255
        self.runbzr('export ../first.tar.tbz2 -r 1')
256
        assert os.path.isfile('../first.tar.tbz2')
257
        from bz2 import BZ2File
258
        tf = TarFile('../first.tar.tbz2', 
259
                     fileobj=BZ2File('../first.tar.tbz2', 'r'))
260
        assert 'first.tar/hello' in tf.getnames(), tf.getnames()
261
        self.assertEqual(tf.extractfile('first.tar/hello').read(), 'foo')
262
        self.runbzr('export ../first2.tar -r 1 --root pizza')
263
        tf = TarFile('../first2.tar')
264
        assert 'pizza/hello' in tf.getnames(), tf.getnames()
265
1185.4.1 by Lalo Martins
blackbox tests for diff
266
    def test_diff(self):
267
        self.example_branch()
268
        file('hello', 'wt').write('hello world!')
269
        self.runbzr('commit -m fixing hello')
270
        output = self.runbzr('diff -r 2..3', backtick=1)
271
        self.assert_('\n+hello world!' in output)
272
        output = self.runbzr('diff -r last:3..last:1', backtick=1)
273
        self.assert_('\n+baz' in output)
274
1432 by Robert Collins
branch: namespace
275
    def test_diff_branches(self):
276
        self.build_tree(['branch1/', 'branch1/file', 'branch2/'])
277
        branch = Branch.initialize('branch1')
278
        branch.add(['file'])
279
        branch.commit('add file')
280
        copy_branch(branch, 'branch2')
281
        print >> open('branch2/file', 'w'), 'new content'
282
        branch2 = Branch.open('branch2')
283
        branch2.commit('update file')
284
        # should open branch1 and diff against branch2, 
285
        output = self.run_bzr_captured(['diff', '-r', 'branch:branch2', 'branch1'])
286
        self.assertEquals(("=== modified file 'file'\n"
287
                           "--- file\n"
288
                           "+++ file\n"
289
                           "@@ -1,1 +1,1 @@\n"
290
                           "-new content\n"
291
                           "+contents of branch1/file\n"
292
                           "\n", ''), output)
293
1185.8.4 by Aaron Bentley
Fixed branch -r
294
    def test_branch(self):
295
        """Branch from one branch to another."""
296
        os.mkdir('a')
297
        os.chdir('a')
298
        self.example_branch()
299
        os.chdir('..')
300
        self.runbzr('branch a b')
1442.1.71 by Robert Collins
'bzr branch' sets the branch-name,
301
        self.assertFileEqual('b\n', 'b/.bzr/branch-name')
1185.8.4 by Aaron Bentley
Fixed branch -r
302
        self.runbzr('branch a c -r 1')
1185.10.1 by Aaron Bentley
Added --basis option to bzr branch
303
        os.chdir('b')
304
        self.runbzr('commit -m foo --unchanged')
305
        os.chdir('..')
1391 by Robert Collins
merge from integration
306
        # naughty - abstraction violations RBC 20050928  
1393 by Robert Collins
reenable remotebranch tests
307
        print "test_branch used to delete the stores, how is this meant to work ?"
308
        #shutil.rmtree('a/.bzr/revision-store')
309
        #shutil.rmtree('a/.bzr/inventory-store', ignore_errors=True)
310
        #shutil.rmtree('a/.bzr/text-store', ignore_errors=True)
1185.10.1 by Aaron Bentley
Added --basis option to bzr branch
311
        self.runbzr('branch a d --basis b')
1185.8.4 by Aaron Bentley
Fixed branch -r
312
1092.1.39 by Robert Collins
merge from mpool
313
    def test_merge(self):
314
        from bzrlib.branch import Branch
1139 by Martin Pool
- merge in merge improvements and additional tests
315
        
1092.1.39 by Robert Collins
merge from mpool
316
        os.mkdir('a')
317
        os.chdir('a')
318
        self.example_branch()
319
        os.chdir('..')
320
        self.runbzr('branch a b')
321
        os.chdir('b')
322
        file('goodbye', 'wt').write('quux')
323
        self.runbzr(['commit',  '-m',  "more u's are always good"])
324
325
        os.chdir('../a')
326
        file('hello', 'wt').write('quuux')
327
        # We can't merge when there are in-tree changes
328
        self.runbzr('merge ../b', retcode=1)
329
        self.runbzr(['commit', '-m', "Like an epidemic of u's"])
1185.12.46 by Aaron Bentley
Fixed -r brokenness in merge
330
        self.runbzr('merge ../b -r last:1..last:1')
331
        self.runbzr('revert --no-backup')
332
        self.runbzr('merge ../b -r last:1')
1092.1.39 by Robert Collins
merge from mpool
333
        self.check_file_contents('goodbye', 'quux')
334
        # Merging a branch pulls its revision into the tree
1185.11.5 by John Arbash Meinel
Merged up-to-date against mainline, still broken.
335
        a = Branch.open('.')
336
        b = Branch.open('../b')
1241 by Martin Pool
- rename last_patch to last_revision
337
        a.get_revision_xml(b.last_revision())
1139 by Martin Pool
- merge in merge improvements and additional tests
338
        self.log('pending merges: %s', a.pending_merges())
1241 by Martin Pool
- rename last_patch to last_revision
339
        #        assert a.pending_merges() == [b.last_revision()], "Assertion %s %s" \
1161 by Martin Pool
- add test that 'bzr add' reports the files as they're added
340
        #        % (a.pending_merges(), b.last_patch())
341
1185.10.8 by Aaron Bentley
Conflict handling where OTHER is deleted
342
    def test_merge_with_missing_file(self):
343
        """Merge handles missing file conflicts"""
344
        os.mkdir('a')
345
        os.chdir('a')
346
        os.mkdir('sub')
347
        print >> file('sub/a.txt', 'wb'), "hello"
1185.10.10 by Aaron Bentley
Handled modified files missing from THIS
348
        print >> file('b.txt', 'wb'), "hello"
349
        print >> file('sub/c.txt', 'wb'), "hello"
1185.10.8 by Aaron Bentley
Conflict handling where OTHER is deleted
350
        self.runbzr('init')
351
        self.runbzr('add')
352
        self.runbzr(('commit', '-m', 'added a'))
353
        self.runbzr('branch . ../b')
354
        print >> file('sub/a.txt', 'ab'), "there"
1185.10.10 by Aaron Bentley
Handled modified files missing from THIS
355
        print >> file('b.txt', 'ab'), "there"
356
        print >> file('sub/c.txt', 'ab'), "there"
1185.10.8 by Aaron Bentley
Conflict handling where OTHER is deleted
357
        self.runbzr(('commit', '-m', 'Added there'))
358
        os.unlink('sub/a.txt')
1185.10.10 by Aaron Bentley
Handled modified files missing from THIS
359
        os.unlink('sub/c.txt')
1185.10.8 by Aaron Bentley
Conflict handling where OTHER is deleted
360
        os.rmdir('sub')
1185.10.10 by Aaron Bentley
Handled modified files missing from THIS
361
        os.unlink('b.txt')
1185.10.8 by Aaron Bentley
Conflict handling where OTHER is deleted
362
        self.runbzr(('commit', '-m', 'Removed a.txt'))
363
        os.chdir('../b')
364
        print >> file('sub/a.txt', 'ab'), "something"
1185.10.10 by Aaron Bentley
Handled modified files missing from THIS
365
        print >> file('b.txt', 'ab'), "something"
366
        print >> file('sub/c.txt', 'ab'), "something"
1185.10.8 by Aaron Bentley
Conflict handling where OTHER is deleted
367
        self.runbzr(('commit', '-m', 'Modified a.txt'))
1476 by Robert Collins
Merge now has a retcode of 1 when conflicts occur. (Robert Collins)
368
        self.runbzr('merge ../a/', retcode=1)
1185.10.8 by Aaron Bentley
Conflict handling where OTHER is deleted
369
        assert os.path.exists('sub/a.txt.THIS')
370
        assert os.path.exists('sub/a.txt.BASE')
1185.10.10 by Aaron Bentley
Handled modified files missing from THIS
371
        os.chdir('../a')
1476 by Robert Collins
Merge now has a retcode of 1 when conflicts occur. (Robert Collins)
372
        self.runbzr('merge ../b/', retcode=1)
1185.10.10 by Aaron Bentley
Handled modified files missing from THIS
373
        assert os.path.exists('sub/a.txt.OTHER')
374
        assert os.path.exists('sub/a.txt.BASE')
1185.10.8 by Aaron Bentley
Conflict handling where OTHER is deleted
375
974.1.71 by Aaron Bentley
Added test for pull
376
    def test_pull(self):
377
        """Pull changes from one branch to another."""
378
        os.mkdir('a')
379
        os.chdir('a')
380
381
        self.example_branch()
974.1.79 by Aaron Bentley
Fixed issues with pull not having a default location after branch
382
        self.runbzr('pull', retcode=1)
383
        self.runbzr('missing', retcode=1)
384
        self.runbzr('missing .')
385
        self.runbzr('missing')
386
        self.runbzr('pull')
387
        self.runbzr('pull /', retcode=1)
388
        self.runbzr('pull')
389
974.1.71 by Aaron Bentley
Added test for pull
390
        os.chdir('..')
391
        self.runbzr('branch a b')
392
        os.chdir('b')
974.1.79 by Aaron Bentley
Fixed issues with pull not having a default location after branch
393
        self.runbzr('pull')
1185.8.5 by Aaron Bentley
Fixed non-tree-root bug in branch, revert, merge
394
        os.mkdir('subdir')
395
        self.runbzr('add subdir')
974.1.71 by Aaron Bentley
Added test for pull
396
        self.runbzr('commit -m blah --unchanged')
397
        os.chdir('../a')
1185.11.5 by John Arbash Meinel
Merged up-to-date against mainline, still broken.
398
        a = Branch.open('.')
399
        b = Branch.open('../b')
974.1.71 by Aaron Bentley
Added test for pull
400
        assert a.revision_history() == b.revision_history()[:-1]
401
        self.runbzr('pull ../b')
402
        assert a.revision_history() == b.revision_history()
403
        self.runbzr('commit -m blah2 --unchanged')
404
        os.chdir('../b')
405
        self.runbzr('commit -m blah3 --unchanged')
1442.1.68 by Robert Collins
'bzr pull' now accepts '--clobber'.
406
        # no clobber
974.1.71 by Aaron Bentley
Added test for pull
407
        self.runbzr('pull ../a', retcode=1)
1442.1.68 by Robert Collins
'bzr pull' now accepts '--clobber'.
408
        os.chdir('..')
409
        self.runbzr('branch b clobberme')
410
        os.chdir('clobberme')
411
        self.runbzr('pull --clobber ../a')
412
        clobbered = Branch.open('.')
413
        self.assertEqual(clobbered.revision_history(),
414
                         a.revision_history())
974.1.74 by Aaron Bentley
Made pull work after remote branch has merged latest revision
415
        os.chdir('../a')
416
        self.runbzr('merge ../b')
417
        self.runbzr('commit -m blah4 --unchanged')
1185.8.5 by Aaron Bentley
Fixed non-tree-root bug in branch, revert, merge
418
        os.chdir('../b/subdir')
419
        self.runbzr('pull ../../a')
974.1.74 by Aaron Bentley
Made pull work after remote branch has merged latest revision
420
        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
421
        self.runbzr('commit -m blah5 --unchanged')
422
        self.runbzr('commit -m blah6 --unchanged')
423
        os.chdir('..')
424
        self.runbzr('pull ../a')
425
        os.chdir('../a')
426
        self.runbzr('commit -m blah7 --unchanged')
427
        self.runbzr('merge ../b')
428
        self.runbzr('commit -m blah8 --unchanged')
429
        self.runbzr('pull ../b')
430
        self.runbzr('pull ../b')
1185.12.11 by Aaron Bentley
Made pull only save the parent location if it is unset, or on --remember
431
432
    def test_locations(self):
433
        """Using and remembering different locations"""
434
        os.mkdir('a')
435
        os.chdir('a')
436
        self.runbzr('init')
437
        self.runbzr('commit -m unchanged --unchanged')
1185.12.12 by Aaron Bentley
Made merge use pull location or die if no branch specified.
438
        self.runbzr('pull', retcode=1)
439
        self.runbzr('merge', retcode=1)
1185.12.11 by Aaron Bentley
Made pull only save the parent location if it is unset, or on --remember
440
        self.runbzr('branch . ../b')
441
        os.chdir('../b')
442
        self.runbzr('pull')
443
        self.runbzr('branch . ../c')
444
        self.runbzr('pull ../c')
1185.12.12 by Aaron Bentley
Made merge use pull location or die if no branch specified.
445
        self.runbzr('merge')
1185.12.11 by Aaron Bentley
Made pull only save the parent location if it is unset, or on --remember
446
        os.chdir('../a')
447
        self.runbzr('pull ../b')
448
        self.runbzr('pull')
449
        self.runbzr('pull ../c')
450
        self.runbzr('branch ../c ../d')
451
        shutil.rmtree('../c')
452
        self.runbzr('pull')
453
        os.chdir('../b')
454
        self.runbzr('pull')
455
        os.chdir('../d')
456
        self.runbzr('pull', retcode=1)
457
        self.runbzr('pull ../a --remember')
458
        self.runbzr('pull')
974.1.74 by Aaron Bentley
Made pull work after remote branch has merged latest revision
459
        
1161 by Martin Pool
- add test that 'bzr add' reports the files as they're added
460
    def test_add_reports(self):
461
        """add command prints the names of added files."""
1185.11.5 by John Arbash Meinel
Merged up-to-date against mainline, still broken.
462
        b = Branch.initialize('.')
1161 by Martin Pool
- add test that 'bzr add' reports the files as they're added
463
        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
464
        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
465
        # 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
466
        results = sorted(out.rstrip('\n').split('\n'))
1161 by Martin Pool
- add test that 'bzr add' reports the files as they're added
467
        self.assertEquals(['added dir',
1185.1.41 by Robert Collins
massive patch from Alexander Belchenko - many PEP8 fixes, removes unused function uuid
468
                           'added dir'+os.sep+'sub.txt',
1161 by Martin Pool
- add test that 'bzr add' reports the files as they're added
469
                           'added top.txt',],
470
                          results)
471
1446 by Robert Collins
fixup the verbose-does-nothing for add - add a --quiet instead
472
    def test_add_quiet_is(self):
473
        """add -q does not print the names of added files."""
474
        b = Branch.initialize('.')
475
        self.build_tree(['top.txt', 'dir/', 'dir/sub.txt'])
476
        out = self.run_bzr_captured(['add', '-q'], retcode = 0)[0]
477
        # the ordering is not defined at the moment
478
        results = sorted(out.rstrip('\n').split('\n'))
479
        self.assertEquals([''], results)
480
1185.3.20 by Martin Pool
- run_bzr_captured also includes logged errors in
481
    def test_unknown_command(self):
482
        """Handling of unknown command."""
483
        out, err = self.run_bzr_captured(['fluffy-badger'],
484
                                         retcode=1)
485
        self.assertEquals(out, '')
486
        err.index('unknown command')
1185.14.9 by Aaron Bentley
Added tests for 'bzr conflicts', 'bzr resolve'
487
488
    def test_conflicts(self):
489
        """Handling of merge conflicts"""
490
        os.mkdir('base')
491
        os.chdir('base')
492
        file('hello', 'wb').write("hi world")
493
        file('answer', 'wb').write("42")
494
        self.runbzr('init')
495
        self.runbzr('add')
496
        self.runbzr('commit -m base')
497
        self.runbzr('branch . ../other')
498
        self.runbzr('branch . ../this')
499
        os.chdir('../other')
500
        file('hello', 'wb').write("Hello.")
501
        file('answer', 'wb').write("Is anyone there?")
502
        self.runbzr('commit -m other')
503
        os.chdir('../this')
504
        file('hello', 'wb').write("Hello, world")
505
        self.runbzr('mv answer question')
506
        file('question', 'wb').write("What do you get when you multiply six"
507
                                   "times nine?")
508
        self.runbzr('commit -m this')
1476 by Robert Collins
Merge now has a retcode of 1 when conflicts occur. (Robert Collins)
509
        self.runbzr('merge ../other --show-base', retcode=1)
1185.18.1 by Aaron Bentley
Added --show-base to merge
510
        conflict_text = file('hello').read()
511
        assert '<<<<<<<' in conflict_text
512
        assert '>>>>>>>' in conflict_text
513
        assert '=======' in conflict_text
514
        assert '|||||||' in conflict_text
515
        assert 'hi world' in conflict_text
516
        self.runbzr('revert')
517
        self.runbzr('resolve --all')
1476 by Robert Collins
Merge now has a retcode of 1 when conflicts occur. (Robert Collins)
518
        self.runbzr('merge ../other', retcode=1)
1185.18.1 by Aaron Bentley
Added --show-base to merge
519
        conflict_text = file('hello').read()
520
        assert '|||||||' not in conflict_text
521
        assert 'hi world' not in conflict_text
1185.14.9 by Aaron Bentley
Added tests for 'bzr conflicts', 'bzr resolve'
522
        result = self.runbzr('conflicts', backtick=1)
523
        self.assertEquals(result, "hello\nquestion\n")
1185.14.11 by Aaron Bentley
moved conflict listing into status and stopped monkey-patching
524
        result = self.runbzr('status', backtick=1)
525
        assert "conflicts:\n  hello\n  question\n" in result, result
1185.14.10 by Aaron Bentley
Commit aborts with conflicts in the tree.
526
        self.runbzr('resolve hello')
1185.14.9 by Aaron Bentley
Added tests for 'bzr conflicts', 'bzr resolve'
527
        result = self.runbzr('conflicts', backtick=1)
528
        self.assertEquals(result, "question\n")
1185.14.10 by Aaron Bentley
Commit aborts with conflicts in the tree.
529
        self.runbzr('commit -m conflicts', retcode=1)
530
        self.runbzr('resolve --all')
1185.14.9 by Aaron Bentley
Added tests for 'bzr conflicts', 'bzr resolve'
531
        result = self.runbzr('conflicts', backtick=1)
1185.14.10 by Aaron Bentley
Commit aborts with conflicts in the tree.
532
        self.runbzr('commit -m conflicts')
1185.14.9 by Aaron Bentley
Added tests for 'bzr conflicts', 'bzr resolve'
533
        self.assertEquals(result, "")
1185.3.20 by Martin Pool
- run_bzr_captured also includes logged errors in
534
1442.1.59 by Robert Collins
Add re-sign command to generate a digital signature on a single revision.
535
    def test_resign(self):
536
        """Test re signing of data."""
537
        import bzrlib.gpg
538
        oldstrategy = bzrlib.gpg.GPGStrategy
539
        branch = Branch.initialize('.')
540
        branch.commit("base", allow_pointless=True, rev_id='A')
541
        try:
542
            # monkey patch gpg signing mechanism
543
            from bzrlib.testament import Testament
544
            bzrlib.gpg.GPGStrategy = bzrlib.gpg.LoopbackGPGStrategy
545
            self.runbzr('re-sign -r revid:A')
546
            self.assertEqual(Testament.from_revision(branch,'A').as_short_text(),
547
                             branch.revision_store.get('A', 'sig').read())
548
        finally:
549
            bzrlib.gpg.GPGStrategy = oldstrategy
1483 by Robert Collins
BUGFIX: re-sign should accept ranges
550
            
551
    def test_resign_range(self):
552
        import bzrlib.gpg
553
        oldstrategy = bzrlib.gpg.GPGStrategy
554
        branch = Branch.initialize('.')
555
        branch.commit("base", allow_pointless=True, rev_id='A')
556
        branch.commit("base", allow_pointless=True, rev_id='B')
557
        branch.commit("base", allow_pointless=True, rev_id='C')
558
        try:
559
            # monkey patch gpg signing mechanism
560
            from bzrlib.testament import Testament
561
            bzrlib.gpg.GPGStrategy = bzrlib.gpg.LoopbackGPGStrategy
562
            self.runbzr('re-sign -r 1..')
563
            self.assertEqual(Testament.from_revision(branch,'A').as_short_text(),
564
                             branch.revision_store.get('A', 'sig').read())
565
            self.assertEqual(Testament.from_revision(branch,'B').as_short_text(),
566
                             branch.revision_store.get('B', 'sig').read())
567
            self.assertEqual(Testament.from_revision(branch,'C').as_short_text(),
568
                             branch.revision_store.get('C', 'sig').read())
569
        finally:
570
            bzrlib.gpg.GPGStrategy = oldstrategy
571
1442.1.59 by Robert Collins
Add re-sign command to generate a digital signature on a single revision.
572
1092.2.6 by Robert Collins
symlink support updated to work
573
def listdir_sorted(dir):
574
    L = os.listdir(dir)
575
    L.sort()
576
    return L
1185.3.20 by Martin Pool
- run_bzr_captured also includes logged errors in
577
1092.2.12 by Robert Collins
merge from HEAD
578
904 by Martin Pool
- more selftest external-command fixes
579
class OldTests(ExternalBase):
1092.1.39 by Robert Collins
merge from mpool
580
    """old tests moved from ./testbzr."""
581
1102 by Martin Pool
- merge test refactoring from robertc
582
    def test_bzr(self):
736 by Martin Pool
- move old blackbox code from testbzr into bzrlib.selftest.blackbox
583
        from os import chdir, mkdir
584
        from os.path import exists
585
904 by Martin Pool
- more selftest external-command fixes
586
        runbzr = self.runbzr
1185.3.26 by Martin Pool
- remove remaining external executions of bzr
587
        capture = self.capture
736 by Martin Pool
- move old blackbox code from testbzr into bzrlib.selftest.blackbox
588
        progress = self.log
589
590
        progress("basic branch creation")
904 by Martin Pool
- more selftest external-command fixes
591
        mkdir('branch1')
736 by Martin Pool
- move old blackbox code from testbzr into bzrlib.selftest.blackbox
592
        chdir('branch1')
898 by Martin Pool
- add new runbzr method for external tests
593
        runbzr('init')
736 by Martin Pool
- move old blackbox code from testbzr into bzrlib.selftest.blackbox
594
1185.3.25 by Martin Pool
- run blackbox tests in-process
595
        self.assertEquals(capture('root').rstrip(),
736 by Martin Pool
- move old blackbox code from testbzr into bzrlib.selftest.blackbox
596
                          os.path.join(self.test_dir, 'branch1'))
597
598
        progress("status of new file")
599
600
        f = file('test.txt', 'wt')
601
        f.write('hello world!\n')
602
        f.close()
603
1185.3.25 by Martin Pool
- run blackbox tests in-process
604
        self.assertEquals(capture('unknowns'), 'test.txt\n')
736 by Martin Pool
- move old blackbox code from testbzr into bzrlib.selftest.blackbox
605
1185.3.25 by Martin Pool
- run blackbox tests in-process
606
        out = capture("status")
736 by Martin Pool
- move old blackbox code from testbzr into bzrlib.selftest.blackbox
607
        assert out == 'unknown:\n  test.txt\n'
608
1185.3.25 by Martin Pool
- run blackbox tests in-process
609
        out = capture("status --all")
736 by Martin Pool
- move old blackbox code from testbzr into bzrlib.selftest.blackbox
610
        assert out == "unknown:\n  test.txt\n"
611
1185.3.25 by Martin Pool
- run blackbox tests in-process
612
        out = capture("status test.txt --all")
736 by Martin Pool
- move old blackbox code from testbzr into bzrlib.selftest.blackbox
613
        assert out == "unknown:\n  test.txt\n"
614
615
        f = file('test2.txt', 'wt')
616
        f.write('goodbye cruel world...\n')
617
        f.close()
618
1185.3.25 by Martin Pool
- run blackbox tests in-process
619
        out = capture("status test.txt")
736 by Martin Pool
- move old blackbox code from testbzr into bzrlib.selftest.blackbox
620
        assert out == "unknown:\n  test.txt\n"
621
1185.3.25 by Martin Pool
- run blackbox tests in-process
622
        out = capture("status")
736 by Martin Pool
- move old blackbox code from testbzr into bzrlib.selftest.blackbox
623
        assert out == ("unknown:\n"
624
                       "  test.txt\n"
625
                       "  test2.txt\n")
626
627
        os.unlink('test2.txt')
628
629
        progress("command aliases")
1185.3.25 by Martin Pool
- run blackbox tests in-process
630
        out = capture("st --all")
736 by Martin Pool
- move old blackbox code from testbzr into bzrlib.selftest.blackbox
631
        assert out == ("unknown:\n"
632
                       "  test.txt\n")
633
1185.3.25 by Martin Pool
- run blackbox tests in-process
634
        out = capture("stat")
736 by Martin Pool
- move old blackbox code from testbzr into bzrlib.selftest.blackbox
635
        assert out == ("unknown:\n"
636
                       "  test.txt\n")
637
638
        progress("command help")
898 by Martin Pool
- add new runbzr method for external tests
639
        runbzr("help st")
640
        runbzr("help")
641
        runbzr("help commands")
642
        runbzr("help slartibartfast", 1)
736 by Martin Pool
- move old blackbox code from testbzr into bzrlib.selftest.blackbox
643
1185.3.25 by Martin Pool
- run blackbox tests in-process
644
        out = capture("help ci")
736 by Martin Pool
- move old blackbox code from testbzr into bzrlib.selftest.blackbox
645
        out.index('aliases: ')
646
647
        progress("can't rename unversioned file")
898 by Martin Pool
- add new runbzr method for external tests
648
        runbzr("rename test.txt new-test.txt", 1)
736 by Martin Pool
- move old blackbox code from testbzr into bzrlib.selftest.blackbox
649
650
        progress("adding a file")
651
898 by Martin Pool
- add new runbzr method for external tests
652
        runbzr("add test.txt")
1185.3.25 by Martin Pool
- run blackbox tests in-process
653
        assert capture("unknowns") == ''
654
        assert capture("status --all") == ("added:\n"
736 by Martin Pool
- move old blackbox code from testbzr into bzrlib.selftest.blackbox
655
                                                "  test.txt\n")
656
657
        progress("rename newly-added file")
898 by Martin Pool
- add new runbzr method for external tests
658
        runbzr("rename test.txt hello.txt")
736 by Martin Pool
- move old blackbox code from testbzr into bzrlib.selftest.blackbox
659
        assert os.path.exists("hello.txt")
660
        assert not os.path.exists("test.txt")
661
1185.3.25 by Martin Pool
- run blackbox tests in-process
662
        assert capture("revno") == '0\n'
736 by Martin Pool
- move old blackbox code from testbzr into bzrlib.selftest.blackbox
663
664
        progress("add first revision")
904 by Martin Pool
- more selftest external-command fixes
665
        runbzr(['commit', '-m', 'add first revision'])
736 by Martin Pool
- move old blackbox code from testbzr into bzrlib.selftest.blackbox
666
667
        progress("more complex renames")
668
        os.mkdir("sub1")
898 by Martin Pool
- add new runbzr method for external tests
669
        runbzr("rename hello.txt sub1", 1)
670
        runbzr("rename hello.txt sub1/hello.txt", 1)
671
        runbzr("move hello.txt sub1", 1)
736 by Martin Pool
- move old blackbox code from testbzr into bzrlib.selftest.blackbox
672
898 by Martin Pool
- add new runbzr method for external tests
673
        runbzr("add sub1")
674
        runbzr("rename sub1 sub2")
675
        runbzr("move hello.txt sub2")
1457.1.4 by Robert Collins
Branch.relpath has been moved to WorkingTree.relpath.
676
        self.assertEqual(capture("relpath sub2/hello.txt"),
677
                         os.path.join("sub2", "hello.txt\n"))
736 by Martin Pool
- move old blackbox code from testbzr into bzrlib.selftest.blackbox
678
679
        assert exists("sub2")
680
        assert exists("sub2/hello.txt")
681
        assert not exists("sub1")
682
        assert not exists("hello.txt")
683
898 by Martin Pool
- add new runbzr method for external tests
684
        runbzr(['commit', '-m', 'commit with some things moved to subdirs'])
736 by Martin Pool
- move old blackbox code from testbzr into bzrlib.selftest.blackbox
685
686
        mkdir("sub1")
898 by Martin Pool
- add new runbzr method for external tests
687
        runbzr('add sub1')
688
        runbzr('move sub2/hello.txt sub1')
736 by Martin Pool
- move old blackbox code from testbzr into bzrlib.selftest.blackbox
689
        assert not exists('sub2/hello.txt')
690
        assert exists('sub1/hello.txt')
898 by Martin Pool
- add new runbzr method for external tests
691
        runbzr('move sub2 sub1')
736 by Martin Pool
- move old blackbox code from testbzr into bzrlib.selftest.blackbox
692
        assert not exists('sub2')
693
        assert exists('sub1/sub2')
694
898 by Martin Pool
- add new runbzr method for external tests
695
        runbzr(['commit', '-m', 'rename nested subdirectories'])
736 by Martin Pool
- move old blackbox code from testbzr into bzrlib.selftest.blackbox
696
697
        chdir('sub1/sub2')
1185.3.25 by Martin Pool
- run blackbox tests in-process
698
        self.assertEquals(capture('root')[:-1],
736 by Martin Pool
- move old blackbox code from testbzr into bzrlib.selftest.blackbox
699
                          os.path.join(self.test_dir, 'branch1'))
898 by Martin Pool
- add new runbzr method for external tests
700
        runbzr('move ../hello.txt .')
736 by Martin Pool
- move old blackbox code from testbzr into bzrlib.selftest.blackbox
701
        assert exists('./hello.txt')
1185.3.25 by Martin Pool
- run blackbox tests in-process
702
        self.assertEquals(capture('relpath hello.txt'),
703
                          os.path.join('sub1', 'sub2', 'hello.txt') + '\n')
704
        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
705
        runbzr(['commit', '-m', 'move to parent directory'])
736 by Martin Pool
- move old blackbox code from testbzr into bzrlib.selftest.blackbox
706
        chdir('..')
1185.3.25 by Martin Pool
- run blackbox tests in-process
707
        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
708
898 by Martin Pool
- add new runbzr method for external tests
709
        runbzr('move sub2/hello.txt .')
736 by Martin Pool
- move old blackbox code from testbzr into bzrlib.selftest.blackbox
710
        assert exists('hello.txt')
711
712
        f = file('hello.txt', 'wt')
713
        f.write('some nice new content\n')
714
        f.close()
715
716
        f = file('msg.tmp', 'wt')
1185.12.25 by Aaron Bentley
Added one-line log format
717
        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
718
        f.close()
719
898 by Martin Pool
- add new runbzr method for external tests
720
        runbzr('commit -F msg.tmp')
736 by Martin Pool
- move old blackbox code from testbzr into bzrlib.selftest.blackbox
721
1185.3.25 by Martin Pool
- run blackbox tests in-process
722
        assert capture('revno') == '5\n'
898 by Martin Pool
- add new runbzr method for external tests
723
        runbzr('export -r 5 export-5.tmp')
724
        runbzr('export export.tmp')
736 by Martin Pool
- move old blackbox code from testbzr into bzrlib.selftest.blackbox
725
898 by Martin Pool
- add new runbzr method for external tests
726
        runbzr('log')
727
        runbzr('log -v')
909.1.5 by Aaron Bentley
Fixed log -v (mostly)
728
        runbzr('log -v --forward')
729
        runbzr('log -m', retcode=1)
1185.3.25 by Martin Pool
- run blackbox tests in-process
730
        log_out = capture('log -m commit')
1185.12.25 by Aaron Bentley
Added one-line log format
731
        assert "this is my new commit\n  and" in log_out
909.1.5 by Aaron Bentley
Fixed log -v (mostly)
732
        assert "rename nested" not in log_out
733
        assert 'revision-id' not in log_out
1185.3.25 by Martin Pool
- run blackbox tests in-process
734
        assert 'revision-id' in capture('log --show-ids -m commit')
736 by Martin Pool
- move old blackbox code from testbzr into bzrlib.selftest.blackbox
735
1185.12.25 by Aaron Bentley
Added one-line log format
736
        log_out = capture('log --line')
737
        for line in log_out.splitlines():
738
            assert len(line) <= 79, len(line)
739
        assert "this is my new commit and" in log_out
740
736 by Martin Pool
- move old blackbox code from testbzr into bzrlib.selftest.blackbox
741
742
        progress("file with spaces in name")
743
        mkdir('sub directory')
744
        file('sub directory/file with spaces ', 'wt').write('see how this works\n')
898 by Martin Pool
- add new runbzr method for external tests
745
        runbzr('add .')
746
        runbzr('diff')
747
        runbzr('commit -m add-spaces')
748
        runbzr('check')
749
750
        runbzr('log')
751
        runbzr('log --forward')
752
753
        runbzr('info')
1092.1.35 by Robert Collins
merge from mpool up to rev 1110
754
1092.2.6 by Robert Collins
symlink support updated to work
755
        if has_symlinks():
756
            progress("symlinks")
757
            mkdir('symlinks')
758
            chdir('symlinks')
759
            runbzr('init')
760
            os.symlink("NOWHERE1", "link1")
761
            runbzr('add link1')
1092.3.4 by Robert Collins
update symlink branch to integration
762
            assert self.capture('unknowns') == ''
1092.2.6 by Robert Collins
symlink support updated to work
763
            runbzr(['commit', '-m', '1: added symlink link1'])
764
    
765
            mkdir('d1')
766
            runbzr('add d1')
1092.3.4 by Robert Collins
update symlink branch to integration
767
            assert self.capture('unknowns') == ''
1092.2.6 by Robert Collins
symlink support updated to work
768
            os.symlink("NOWHERE2", "d1/link2")
1092.3.4 by Robert Collins
update symlink branch to integration
769
            assert self.capture('unknowns') == 'd1/link2\n'
1092.2.6 by Robert Collins
symlink support updated to work
770
            # is d1/link2 found when adding d1
771
            runbzr('add d1')
1092.3.4 by Robert Collins
update symlink branch to integration
772
            assert self.capture('unknowns') == ''
1092.2.6 by Robert Collins
symlink support updated to work
773
            os.symlink("NOWHERE3", "d1/link3")
1092.3.4 by Robert Collins
update symlink branch to integration
774
            assert self.capture('unknowns') == 'd1/link3\n'
1092.2.6 by Robert Collins
symlink support updated to work
775
            runbzr(['commit', '-m', '2: added dir, symlink'])
776
    
777
            runbzr('rename d1 d2')
778
            runbzr('move d2/link2 .')
779
            runbzr('move link1 d2')
780
            assert os.readlink("./link2") == "NOWHERE2"
781
            assert os.readlink("d2/link1") == "NOWHERE1"
782
            runbzr('add d2/link3')
783
            runbzr('diff')
784
            runbzr(['commit', '-m', '3: rename of dir, move symlinks, add link3'])
785
    
786
            os.unlink("link2")
787
            os.symlink("TARGET 2", "link2")
788
            os.unlink("d2/link1")
789
            os.symlink("TARGET 1", "d2/link1")
790
            runbzr('diff')
1092.3.4 by Robert Collins
update symlink branch to integration
791
            assert self.capture("relpath d2/link1") == "d2/link1\n"
1092.2.6 by Robert Collins
symlink support updated to work
792
            runbzr(['commit', '-m', '4: retarget of two links'])
793
    
794
            runbzr('remove d2/link1')
1092.3.4 by Robert Collins
update symlink branch to integration
795
            assert self.capture('unknowns') == 'd2/link1\n'
1092.2.20 by Robert Collins
symlink and weaves, whaddya know
796
            runbzr(['commit', '-m', '5: remove d2/link1'])
1424 by Robert Collins
add rm alias to remove
797
            # try with the rm alias
798
            runbzr('add d2/link1')
799
            runbzr(['commit', '-m', '6: add d2/link1'])
800
            runbzr('rm d2/link1')
801
            assert self.capture('unknowns') == 'd2/link1\n'
802
            runbzr(['commit', '-m', '7: remove d2/link1'])
1092.2.6 by Robert Collins
symlink support updated to work
803
    
804
            os.mkdir("d1")
805
            runbzr('add d1')
806
            runbzr('rename d2/link3 d1/link3new')
1092.3.4 by Robert Collins
update symlink branch to integration
807
            assert self.capture('unknowns') == 'd2/link1\n'
1424 by Robert Collins
add rm alias to remove
808
            runbzr(['commit', '-m', '8: remove d2/link1, move/rename link3'])
1092.2.6 by Robert Collins
symlink support updated to work
809
            
810
            runbzr(['check'])
811
            
812
            runbzr(['export', '-r', '1', 'exp1.tmp'])
813
            chdir("exp1.tmp")
814
            assert listdir_sorted(".") == [ "link1" ]
815
            assert os.readlink("link1") == "NOWHERE1"
816
            chdir("..")
817
            
818
            runbzr(['export', '-r', '2', 'exp2.tmp'])
819
            chdir("exp2.tmp")
820
            assert listdir_sorted(".") == [ "d1", "link1" ]
821
            chdir("..")
822
            
823
            runbzr(['export', '-r', '3', 'exp3.tmp'])
824
            chdir("exp3.tmp")
825
            assert listdir_sorted(".") == [ "d2", "link2" ]
826
            assert listdir_sorted("d2") == [ "link1", "link3" ]
827
            assert os.readlink("d2/link1") == "NOWHERE1"
828
            assert os.readlink("link2")    == "NOWHERE2"
829
            chdir("..")
830
            
831
            runbzr(['export', '-r', '4', 'exp4.tmp'])
832
            chdir("exp4.tmp")
833
            assert listdir_sorted(".") == [ "d2", "link2" ]
834
            assert os.readlink("d2/link1") == "TARGET 1"
835
            assert os.readlink("link2")    == "TARGET 2"
836
            assert listdir_sorted("d2") == [ "link1", "link3" ]
837
            chdir("..")
838
            
839
            runbzr(['export', '-r', '5', 'exp5.tmp'])
840
            chdir("exp5.tmp")
841
            assert listdir_sorted(".") == [ "d2", "link2" ]
842
            assert os.path.islink("link2")
843
            assert listdir_sorted("d2")== [ "link3" ]
844
            chdir("..")
845
            
1424 by Robert Collins
add rm alias to remove
846
            runbzr(['export', '-r', '8', 'exp6.tmp'])
1092.2.6 by Robert Collins
symlink support updated to work
847
            chdir("exp6.tmp")
1424 by Robert Collins
add rm alias to remove
848
            self.assertEqual(listdir_sorted("."), [ "d1", "d2", "link2"])
1092.2.6 by Robert Collins
symlink support updated to work
849
            assert listdir_sorted("d1") == [ "link3new" ]
850
            assert listdir_sorted("d2") == []
851
            assert os.readlink("d1/link3new") == "NOWHERE3"
852
            chdir("..")
853
        else:
854
            progress("skipping symlink tests")
1400.1.1 by Robert Collins
implement a basic test for the ui branch command from http servers
855
856
857
class HttpTests(TestCaseWithWebserver):
858
    """Test bzr ui commands against remote branches."""
859
860
    def test_branch(self):
861
        os.mkdir('from')
862
        branch = Branch.initialize('from')
863
        branch.commit('empty commit for nonsense', allow_pointless=True)
864
        url = self.get_remote_url('from')
865
        self.run_bzr('branch', url, 'to')
866
        branch = Branch.open('to')
867
        self.assertEqual(1, len(branch.revision_history()))
1185.16.48 by mbp at sourcefrog
- more refactoring of and tests for option parsing
868
1442.1.64 by Robert Collins
Branch.open_containing now returns a tuple (Branch, relative-path).
869
    def test_log(self):
870
        self.build_tree(['branch/', 'branch/file'])
871
        branch = Branch.initialize('branch')
872
        branch.add(['file'])
873
        branch.commit('add file', rev_id='A')
874
        url = self.get_remote_url('branch/file')
875
        output = self.capture('log %s' % url)
876
        self.assertEqual(7, len(output.split('\n')))
877
        
878
879
1185.16.48 by mbp at sourcefrog
- more refactoring of and tests for option parsing
880