/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.84 by Aaron Bentley
got merge type selection under test
330
        self.runbzr('merge ../b -r last:1..last:1 --merge-type blooof',
331
                    retcode=1)
332
        self.runbzr('merge ../b -r last:1..last:1 --merge-type merge3')
333
        self.runbzr('revert --no-backup')
334
        self.runbzr('merge ../b -r last:1..last:1 --merge-type weave')
1185.12.46 by Aaron Bentley
Fixed -r brokenness in merge
335
        self.runbzr('revert --no-backup')
336
        self.runbzr('merge ../b -r last:1')
1092.1.39 by Robert Collins
merge from mpool
337
        self.check_file_contents('goodbye', 'quux')
338
        # Merging a branch pulls its revision into the tree
1185.11.5 by John Arbash Meinel
Merged up-to-date against mainline, still broken.
339
        a = Branch.open('.')
340
        b = Branch.open('../b')
1241 by Martin Pool
- rename last_patch to last_revision
341
        a.get_revision_xml(b.last_revision())
1139 by Martin Pool
- merge in merge improvements and additional tests
342
        self.log('pending merges: %s', a.pending_merges())
1185.12.77 by Aaron Bentley
Prevented all ancestors from being marked as pending merges
343
        assert a.pending_merges() == [b.last_revision()], "Assertion %s %s" \
344
            % (a.pending_merges(), b.last_patch())
345
        self.runbzr('commit -m merged')
346
        self.runbzr('merge ../b -r last:1')
347
        self.assertEqual(Branch.open('.').pending_merges(), [])
348
1161 by Martin Pool
- add test that 'bzr add' reports the files as they're added
349
1185.10.8 by Aaron Bentley
Conflict handling where OTHER is deleted
350
    def test_merge_with_missing_file(self):
351
        """Merge handles missing file conflicts"""
352
        os.mkdir('a')
353
        os.chdir('a')
354
        os.mkdir('sub')
355
        print >> file('sub/a.txt', 'wb'), "hello"
1185.10.10 by Aaron Bentley
Handled modified files missing from THIS
356
        print >> file('b.txt', 'wb'), "hello"
357
        print >> file('sub/c.txt', 'wb'), "hello"
1185.10.8 by Aaron Bentley
Conflict handling where OTHER is deleted
358
        self.runbzr('init')
359
        self.runbzr('add')
360
        self.runbzr(('commit', '-m', 'added a'))
361
        self.runbzr('branch . ../b')
362
        print >> file('sub/a.txt', 'ab'), "there"
1185.10.10 by Aaron Bentley
Handled modified files missing from THIS
363
        print >> file('b.txt', 'ab'), "there"
364
        print >> file('sub/c.txt', 'ab'), "there"
1185.10.8 by Aaron Bentley
Conflict handling where OTHER is deleted
365
        self.runbzr(('commit', '-m', 'Added there'))
366
        os.unlink('sub/a.txt')
1185.10.10 by Aaron Bentley
Handled modified files missing from THIS
367
        os.unlink('sub/c.txt')
1185.10.8 by Aaron Bentley
Conflict handling where OTHER is deleted
368
        os.rmdir('sub')
1185.10.10 by Aaron Bentley
Handled modified files missing from THIS
369
        os.unlink('b.txt')
1185.10.8 by Aaron Bentley
Conflict handling where OTHER is deleted
370
        self.runbzr(('commit', '-m', 'Removed a.txt'))
371
        os.chdir('../b')
372
        print >> file('sub/a.txt', 'ab'), "something"
1185.10.10 by Aaron Bentley
Handled modified files missing from THIS
373
        print >> file('b.txt', 'ab'), "something"
374
        print >> file('sub/c.txt', 'ab'), "something"
1185.10.8 by Aaron Bentley
Conflict handling where OTHER is deleted
375
        self.runbzr(('commit', '-m', 'Modified a.txt'))
1476 by Robert Collins
Merge now has a retcode of 1 when conflicts occur. (Robert Collins)
376
        self.runbzr('merge ../a/', retcode=1)
1185.10.8 by Aaron Bentley
Conflict handling where OTHER is deleted
377
        assert os.path.exists('sub/a.txt.THIS')
378
        assert os.path.exists('sub/a.txt.BASE')
1185.10.10 by Aaron Bentley
Handled modified files missing from THIS
379
        os.chdir('../a')
1476 by Robert Collins
Merge now has a retcode of 1 when conflicts occur. (Robert Collins)
380
        self.runbzr('merge ../b/', retcode=1)
1185.10.10 by Aaron Bentley
Handled modified files missing from THIS
381
        assert os.path.exists('sub/a.txt.OTHER')
382
        assert os.path.exists('sub/a.txt.BASE')
1185.10.8 by Aaron Bentley
Conflict handling where OTHER is deleted
383
974.1.71 by Aaron Bentley
Added test for pull
384
    def test_pull(self):
385
        """Pull changes from one branch to another."""
386
        os.mkdir('a')
387
        os.chdir('a')
388
389
        self.example_branch()
974.1.79 by Aaron Bentley
Fixed issues with pull not having a default location after branch
390
        self.runbzr('pull', retcode=1)
391
        self.runbzr('missing', retcode=1)
392
        self.runbzr('missing .')
393
        self.runbzr('missing')
394
        self.runbzr('pull')
395
        self.runbzr('pull /', retcode=1)
396
        self.runbzr('pull')
397
974.1.71 by Aaron Bentley
Added test for pull
398
        os.chdir('..')
399
        self.runbzr('branch a b')
400
        os.chdir('b')
974.1.79 by Aaron Bentley
Fixed issues with pull not having a default location after branch
401
        self.runbzr('pull')
1185.8.5 by Aaron Bentley
Fixed non-tree-root bug in branch, revert, merge
402
        os.mkdir('subdir')
403
        self.runbzr('add subdir')
974.1.71 by Aaron Bentley
Added test for pull
404
        self.runbzr('commit -m blah --unchanged')
405
        os.chdir('../a')
1185.11.5 by John Arbash Meinel
Merged up-to-date against mainline, still broken.
406
        a = Branch.open('.')
407
        b = Branch.open('../b')
974.1.71 by Aaron Bentley
Added test for pull
408
        assert a.revision_history() == b.revision_history()[:-1]
409
        self.runbzr('pull ../b')
410
        assert a.revision_history() == b.revision_history()
411
        self.runbzr('commit -m blah2 --unchanged')
412
        os.chdir('../b')
413
        self.runbzr('commit -m blah3 --unchanged')
1185.12.92 by Aaron Bentley
Fixed pull help, renamed clobber to overwrite
414
        # no overwrite
974.1.71 by Aaron Bentley
Added test for pull
415
        self.runbzr('pull ../a', retcode=1)
1442.1.68 by Robert Collins
'bzr pull' now accepts '--clobber'.
416
        os.chdir('..')
1185.12.92 by Aaron Bentley
Fixed pull help, renamed clobber to overwrite
417
        self.runbzr('branch b overwriteme')
418
        os.chdir('overwriteme')
419
        self.runbzr('pull --overwrite ../a')
420
        overwritten = Branch.open('.')
421
        self.assertEqual(overwritten.revision_history(),
1442.1.68 by Robert Collins
'bzr pull' now accepts '--clobber'.
422
                         a.revision_history())
974.1.74 by Aaron Bentley
Made pull work after remote branch has merged latest revision
423
        os.chdir('../a')
424
        self.runbzr('merge ../b')
425
        self.runbzr('commit -m blah4 --unchanged')
1185.8.5 by Aaron Bentley
Fixed non-tree-root bug in branch, revert, merge
426
        os.chdir('../b/subdir')
427
        self.runbzr('pull ../../a')
974.1.74 by Aaron Bentley
Made pull work after remote branch has merged latest revision
428
        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
429
        self.runbzr('commit -m blah5 --unchanged')
430
        self.runbzr('commit -m blah6 --unchanged')
431
        os.chdir('..')
432
        self.runbzr('pull ../a')
433
        os.chdir('../a')
434
        self.runbzr('commit -m blah7 --unchanged')
435
        self.runbzr('merge ../b')
436
        self.runbzr('commit -m blah8 --unchanged')
437
        self.runbzr('pull ../b')
438
        self.runbzr('pull ../b')
1185.12.11 by Aaron Bentley
Made pull only save the parent location if it is unset, or on --remember
439
440
    def test_locations(self):
441
        """Using and remembering different locations"""
442
        os.mkdir('a')
443
        os.chdir('a')
444
        self.runbzr('init')
445
        self.runbzr('commit -m unchanged --unchanged')
1185.12.12 by Aaron Bentley
Made merge use pull location or die if no branch specified.
446
        self.runbzr('pull', retcode=1)
447
        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
448
        self.runbzr('branch . ../b')
449
        os.chdir('../b')
450
        self.runbzr('pull')
451
        self.runbzr('branch . ../c')
452
        self.runbzr('pull ../c')
1185.12.12 by Aaron Bentley
Made merge use pull location or die if no branch specified.
453
        self.runbzr('merge')
1185.12.11 by Aaron Bentley
Made pull only save the parent location if it is unset, or on --remember
454
        os.chdir('../a')
455
        self.runbzr('pull ../b')
456
        self.runbzr('pull')
457
        self.runbzr('pull ../c')
458
        self.runbzr('branch ../c ../d')
459
        shutil.rmtree('../c')
460
        self.runbzr('pull')
461
        os.chdir('../b')
462
        self.runbzr('pull')
463
        os.chdir('../d')
464
        self.runbzr('pull', retcode=1)
465
        self.runbzr('pull ../a --remember')
466
        self.runbzr('pull')
974.1.74 by Aaron Bentley
Made pull work after remote branch has merged latest revision
467
        
1161 by Martin Pool
- add test that 'bzr add' reports the files as they're added
468
    def test_add_reports(self):
469
        """add command prints the names of added files."""
1185.11.5 by John Arbash Meinel
Merged up-to-date against mainline, still broken.
470
        b = Branch.initialize('.')
1161 by Martin Pool
- add test that 'bzr add' reports the files as they're added
471
        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
472
        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
473
        # 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
474
        results = sorted(out.rstrip('\n').split('\n'))
1161 by Martin Pool
- add test that 'bzr add' reports the files as they're added
475
        self.assertEquals(['added dir',
1185.1.41 by Robert Collins
massive patch from Alexander Belchenko - many PEP8 fixes, removes unused function uuid
476
                           'added dir'+os.sep+'sub.txt',
1161 by Martin Pool
- add test that 'bzr add' reports the files as they're added
477
                           'added top.txt',],
478
                          results)
479
1446 by Robert Collins
fixup the verbose-does-nothing for add - add a --quiet instead
480
    def test_add_quiet_is(self):
481
        """add -q does not print the names of added files."""
482
        b = Branch.initialize('.')
483
        self.build_tree(['top.txt', 'dir/', 'dir/sub.txt'])
484
        out = self.run_bzr_captured(['add', '-q'], retcode = 0)[0]
485
        # the ordering is not defined at the moment
486
        results = sorted(out.rstrip('\n').split('\n'))
487
        self.assertEquals([''], results)
488
1185.3.20 by Martin Pool
- run_bzr_captured also includes logged errors in
489
    def test_unknown_command(self):
490
        """Handling of unknown command."""
491
        out, err = self.run_bzr_captured(['fluffy-badger'],
492
                                         retcode=1)
493
        self.assertEquals(out, '')
494
        err.index('unknown command')
1185.14.9 by Aaron Bentley
Added tests for 'bzr conflicts', 'bzr resolve'
495
496
    def test_conflicts(self):
497
        """Handling of merge conflicts"""
498
        os.mkdir('base')
499
        os.chdir('base')
500
        file('hello', 'wb').write("hi world")
501
        file('answer', 'wb').write("42")
502
        self.runbzr('init')
503
        self.runbzr('add')
504
        self.runbzr('commit -m base')
505
        self.runbzr('branch . ../other')
506
        self.runbzr('branch . ../this')
507
        os.chdir('../other')
508
        file('hello', 'wb').write("Hello.")
509
        file('answer', 'wb').write("Is anyone there?")
510
        self.runbzr('commit -m other')
511
        os.chdir('../this')
512
        file('hello', 'wb').write("Hello, world")
513
        self.runbzr('mv answer question')
514
        file('question', 'wb').write("What do you get when you multiply six"
515
                                   "times nine?")
516
        self.runbzr('commit -m this')
1476 by Robert Collins
Merge now has a retcode of 1 when conflicts occur. (Robert Collins)
517
        self.runbzr('merge ../other --show-base', retcode=1)
1185.18.1 by Aaron Bentley
Added --show-base to merge
518
        conflict_text = file('hello').read()
519
        assert '<<<<<<<' in conflict_text
520
        assert '>>>>>>>' in conflict_text
521
        assert '=======' in conflict_text
522
        assert '|||||||' in conflict_text
523
        assert 'hi world' in conflict_text
524
        self.runbzr('revert')
525
        self.runbzr('resolve --all')
1476 by Robert Collins
Merge now has a retcode of 1 when conflicts occur. (Robert Collins)
526
        self.runbzr('merge ../other', retcode=1)
1185.18.1 by Aaron Bentley
Added --show-base to merge
527
        conflict_text = file('hello').read()
528
        assert '|||||||' not in conflict_text
529
        assert 'hi world' not in conflict_text
1185.14.9 by Aaron Bentley
Added tests for 'bzr conflicts', 'bzr resolve'
530
        result = self.runbzr('conflicts', backtick=1)
531
        self.assertEquals(result, "hello\nquestion\n")
1185.14.11 by Aaron Bentley
moved conflict listing into status and stopped monkey-patching
532
        result = self.runbzr('status', backtick=1)
533
        assert "conflicts:\n  hello\n  question\n" in result, result
1185.14.10 by Aaron Bentley
Commit aborts with conflicts in the tree.
534
        self.runbzr('resolve hello')
1185.14.9 by Aaron Bentley
Added tests for 'bzr conflicts', 'bzr resolve'
535
        result = self.runbzr('conflicts', backtick=1)
536
        self.assertEquals(result, "question\n")
1185.14.10 by Aaron Bentley
Commit aborts with conflicts in the tree.
537
        self.runbzr('commit -m conflicts', retcode=1)
538
        self.runbzr('resolve --all')
1185.14.9 by Aaron Bentley
Added tests for 'bzr conflicts', 'bzr resolve'
539
        result = self.runbzr('conflicts', backtick=1)
1185.14.10 by Aaron Bentley
Commit aborts with conflicts in the tree.
540
        self.runbzr('commit -m conflicts')
1185.14.9 by Aaron Bentley
Added tests for 'bzr conflicts', 'bzr resolve'
541
        self.assertEquals(result, "")
1185.3.20 by Martin Pool
- run_bzr_captured also includes logged errors in
542
1442.1.59 by Robert Collins
Add re-sign command to generate a digital signature on a single revision.
543
    def test_resign(self):
544
        """Test re signing of data."""
545
        import bzrlib.gpg
546
        oldstrategy = bzrlib.gpg.GPGStrategy
547
        branch = Branch.initialize('.')
548
        branch.commit("base", allow_pointless=True, rev_id='A')
549
        try:
550
            # monkey patch gpg signing mechanism
551
            from bzrlib.testament import Testament
552
            bzrlib.gpg.GPGStrategy = bzrlib.gpg.LoopbackGPGStrategy
553
            self.runbzr('re-sign -r revid:A')
554
            self.assertEqual(Testament.from_revision(branch,'A').as_short_text(),
555
                             branch.revision_store.get('A', 'sig').read())
556
        finally:
557
            bzrlib.gpg.GPGStrategy = oldstrategy
1483 by Robert Collins
BUGFIX: re-sign should accept ranges
558
            
559
    def test_resign_range(self):
560
        import bzrlib.gpg
561
        oldstrategy = bzrlib.gpg.GPGStrategy
562
        branch = Branch.initialize('.')
563
        branch.commit("base", allow_pointless=True, rev_id='A')
564
        branch.commit("base", allow_pointless=True, rev_id='B')
565
        branch.commit("base", allow_pointless=True, rev_id='C')
566
        try:
567
            # monkey patch gpg signing mechanism
568
            from bzrlib.testament import Testament
569
            bzrlib.gpg.GPGStrategy = bzrlib.gpg.LoopbackGPGStrategy
570
            self.runbzr('re-sign -r 1..')
571
            self.assertEqual(Testament.from_revision(branch,'A').as_short_text(),
572
                             branch.revision_store.get('A', 'sig').read())
573
            self.assertEqual(Testament.from_revision(branch,'B').as_short_text(),
574
                             branch.revision_store.get('B', 'sig').read())
575
            self.assertEqual(Testament.from_revision(branch,'C').as_short_text(),
576
                             branch.revision_store.get('C', 'sig').read())
577
        finally:
578
            bzrlib.gpg.GPGStrategy = oldstrategy
579
1442.1.59 by Robert Collins
Add re-sign command to generate a digital signature on a single revision.
580
1092.2.6 by Robert Collins
symlink support updated to work
581
def listdir_sorted(dir):
582
    L = os.listdir(dir)
583
    L.sort()
584
    return L
1185.3.20 by Martin Pool
- run_bzr_captured also includes logged errors in
585
1092.2.12 by Robert Collins
merge from HEAD
586
904 by Martin Pool
- more selftest external-command fixes
587
class OldTests(ExternalBase):
1092.1.39 by Robert Collins
merge from mpool
588
    """old tests moved from ./testbzr."""
589
1102 by Martin Pool
- merge test refactoring from robertc
590
    def test_bzr(self):
736 by Martin Pool
- move old blackbox code from testbzr into bzrlib.selftest.blackbox
591
        from os import chdir, mkdir
592
        from os.path import exists
593
904 by Martin Pool
- more selftest external-command fixes
594
        runbzr = self.runbzr
1185.3.26 by Martin Pool
- remove remaining external executions of bzr
595
        capture = self.capture
736 by Martin Pool
- move old blackbox code from testbzr into bzrlib.selftest.blackbox
596
        progress = self.log
597
598
        progress("basic branch creation")
904 by Martin Pool
- more selftest external-command fixes
599
        mkdir('branch1')
736 by Martin Pool
- move old blackbox code from testbzr into bzrlib.selftest.blackbox
600
        chdir('branch1')
898 by Martin Pool
- add new runbzr method for external tests
601
        runbzr('init')
736 by Martin Pool
- move old blackbox code from testbzr into bzrlib.selftest.blackbox
602
1185.3.25 by Martin Pool
- run blackbox tests in-process
603
        self.assertEquals(capture('root').rstrip(),
736 by Martin Pool
- move old blackbox code from testbzr into bzrlib.selftest.blackbox
604
                          os.path.join(self.test_dir, 'branch1'))
605
606
        progress("status of new file")
607
608
        f = file('test.txt', 'wt')
609
        f.write('hello world!\n')
610
        f.close()
611
1185.3.25 by Martin Pool
- run blackbox tests in-process
612
        self.assertEquals(capture('unknowns'), 'test.txt\n')
736 by Martin Pool
- move old blackbox code from testbzr into bzrlib.selftest.blackbox
613
1185.3.25 by Martin Pool
- run blackbox tests in-process
614
        out = capture("status")
736 by Martin Pool
- move old blackbox code from testbzr into bzrlib.selftest.blackbox
615
        assert out == 'unknown:\n  test.txt\n'
616
1185.3.25 by Martin Pool
- run blackbox tests in-process
617
        out = capture("status --all")
736 by Martin Pool
- move old blackbox code from testbzr into bzrlib.selftest.blackbox
618
        assert out == "unknown:\n  test.txt\n"
619
1185.3.25 by Martin Pool
- run blackbox tests in-process
620
        out = capture("status test.txt --all")
736 by Martin Pool
- move old blackbox code from testbzr into bzrlib.selftest.blackbox
621
        assert out == "unknown:\n  test.txt\n"
622
623
        f = file('test2.txt', 'wt')
624
        f.write('goodbye cruel world...\n')
625
        f.close()
626
1185.3.25 by Martin Pool
- run blackbox tests in-process
627
        out = capture("status test.txt")
736 by Martin Pool
- move old blackbox code from testbzr into bzrlib.selftest.blackbox
628
        assert out == "unknown:\n  test.txt\n"
629
1185.3.25 by Martin Pool
- run blackbox tests in-process
630
        out = capture("status")
736 by Martin Pool
- move old blackbox code from testbzr into bzrlib.selftest.blackbox
631
        assert out == ("unknown:\n"
632
                       "  test.txt\n"
633
                       "  test2.txt\n")
634
635
        os.unlink('test2.txt')
636
637
        progress("command aliases")
1185.3.25 by Martin Pool
- run blackbox tests in-process
638
        out = capture("st --all")
736 by Martin Pool
- move old blackbox code from testbzr into bzrlib.selftest.blackbox
639
        assert out == ("unknown:\n"
640
                       "  test.txt\n")
641
1185.3.25 by Martin Pool
- run blackbox tests in-process
642
        out = capture("stat")
736 by Martin Pool
- move old blackbox code from testbzr into bzrlib.selftest.blackbox
643
        assert out == ("unknown:\n"
644
                       "  test.txt\n")
645
646
        progress("command help")
898 by Martin Pool
- add new runbzr method for external tests
647
        runbzr("help st")
648
        runbzr("help")
649
        runbzr("help commands")
650
        runbzr("help slartibartfast", 1)
736 by Martin Pool
- move old blackbox code from testbzr into bzrlib.selftest.blackbox
651
1185.3.25 by Martin Pool
- run blackbox tests in-process
652
        out = capture("help ci")
736 by Martin Pool
- move old blackbox code from testbzr into bzrlib.selftest.blackbox
653
        out.index('aliases: ')
654
655
        progress("can't rename unversioned file")
898 by Martin Pool
- add new runbzr method for external tests
656
        runbzr("rename test.txt new-test.txt", 1)
736 by Martin Pool
- move old blackbox code from testbzr into bzrlib.selftest.blackbox
657
658
        progress("adding a file")
659
898 by Martin Pool
- add new runbzr method for external tests
660
        runbzr("add test.txt")
1185.3.25 by Martin Pool
- run blackbox tests in-process
661
        assert capture("unknowns") == ''
662
        assert capture("status --all") == ("added:\n"
736 by Martin Pool
- move old blackbox code from testbzr into bzrlib.selftest.blackbox
663
                                                "  test.txt\n")
664
665
        progress("rename newly-added file")
898 by Martin Pool
- add new runbzr method for external tests
666
        runbzr("rename test.txt hello.txt")
736 by Martin Pool
- move old blackbox code from testbzr into bzrlib.selftest.blackbox
667
        assert os.path.exists("hello.txt")
668
        assert not os.path.exists("test.txt")
669
1185.3.25 by Martin Pool
- run blackbox tests in-process
670
        assert capture("revno") == '0\n'
736 by Martin Pool
- move old blackbox code from testbzr into bzrlib.selftest.blackbox
671
672
        progress("add first revision")
904 by Martin Pool
- more selftest external-command fixes
673
        runbzr(['commit', '-m', 'add first revision'])
736 by Martin Pool
- move old blackbox code from testbzr into bzrlib.selftest.blackbox
674
675
        progress("more complex renames")
676
        os.mkdir("sub1")
898 by Martin Pool
- add new runbzr method for external tests
677
        runbzr("rename hello.txt sub1", 1)
678
        runbzr("rename hello.txt sub1/hello.txt", 1)
679
        runbzr("move hello.txt sub1", 1)
736 by Martin Pool
- move old blackbox code from testbzr into bzrlib.selftest.blackbox
680
898 by Martin Pool
- add new runbzr method for external tests
681
        runbzr("add sub1")
682
        runbzr("rename sub1 sub2")
683
        runbzr("move hello.txt sub2")
1457.1.4 by Robert Collins
Branch.relpath has been moved to WorkingTree.relpath.
684
        self.assertEqual(capture("relpath sub2/hello.txt"),
685
                         os.path.join("sub2", "hello.txt\n"))
736 by Martin Pool
- move old blackbox code from testbzr into bzrlib.selftest.blackbox
686
687
        assert exists("sub2")
688
        assert exists("sub2/hello.txt")
689
        assert not exists("sub1")
690
        assert not exists("hello.txt")
691
898 by Martin Pool
- add new runbzr method for external tests
692
        runbzr(['commit', '-m', 'commit with some things moved to subdirs'])
736 by Martin Pool
- move old blackbox code from testbzr into bzrlib.selftest.blackbox
693
694
        mkdir("sub1")
898 by Martin Pool
- add new runbzr method for external tests
695
        runbzr('add sub1')
696
        runbzr('move sub2/hello.txt sub1')
736 by Martin Pool
- move old blackbox code from testbzr into bzrlib.selftest.blackbox
697
        assert not exists('sub2/hello.txt')
698
        assert exists('sub1/hello.txt')
898 by Martin Pool
- add new runbzr method for external tests
699
        runbzr('move sub2 sub1')
736 by Martin Pool
- move old blackbox code from testbzr into bzrlib.selftest.blackbox
700
        assert not exists('sub2')
701
        assert exists('sub1/sub2')
702
898 by Martin Pool
- add new runbzr method for external tests
703
        runbzr(['commit', '-m', 'rename nested subdirectories'])
736 by Martin Pool
- move old blackbox code from testbzr into bzrlib.selftest.blackbox
704
705
        chdir('sub1/sub2')
1185.3.25 by Martin Pool
- run blackbox tests in-process
706
        self.assertEquals(capture('root')[:-1],
736 by Martin Pool
- move old blackbox code from testbzr into bzrlib.selftest.blackbox
707
                          os.path.join(self.test_dir, 'branch1'))
898 by Martin Pool
- add new runbzr method for external tests
708
        runbzr('move ../hello.txt .')
736 by Martin Pool
- move old blackbox code from testbzr into bzrlib.selftest.blackbox
709
        assert exists('./hello.txt')
1185.3.25 by Martin Pool
- run blackbox tests in-process
710
        self.assertEquals(capture('relpath hello.txt'),
711
                          os.path.join('sub1', 'sub2', 'hello.txt') + '\n')
712
        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
713
        runbzr(['commit', '-m', 'move to parent directory'])
736 by Martin Pool
- move old blackbox code from testbzr into bzrlib.selftest.blackbox
714
        chdir('..')
1185.3.25 by Martin Pool
- run blackbox tests in-process
715
        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
716
898 by Martin Pool
- add new runbzr method for external tests
717
        runbzr('move sub2/hello.txt .')
736 by Martin Pool
- move old blackbox code from testbzr into bzrlib.selftest.blackbox
718
        assert exists('hello.txt')
719
720
        f = file('hello.txt', 'wt')
721
        f.write('some nice new content\n')
722
        f.close()
723
724
        f = file('msg.tmp', 'wt')
1185.12.25 by Aaron Bentley
Added one-line log format
725
        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
726
        f.close()
727
898 by Martin Pool
- add new runbzr method for external tests
728
        runbzr('commit -F msg.tmp')
736 by Martin Pool
- move old blackbox code from testbzr into bzrlib.selftest.blackbox
729
1185.3.25 by Martin Pool
- run blackbox tests in-process
730
        assert capture('revno') == '5\n'
898 by Martin Pool
- add new runbzr method for external tests
731
        runbzr('export -r 5 export-5.tmp')
732
        runbzr('export export.tmp')
736 by Martin Pool
- move old blackbox code from testbzr into bzrlib.selftest.blackbox
733
898 by Martin Pool
- add new runbzr method for external tests
734
        runbzr('log')
735
        runbzr('log -v')
909.1.5 by Aaron Bentley
Fixed log -v (mostly)
736
        runbzr('log -v --forward')
737
        runbzr('log -m', retcode=1)
1185.3.25 by Martin Pool
- run blackbox tests in-process
738
        log_out = capture('log -m commit')
1185.12.25 by Aaron Bentley
Added one-line log format
739
        assert "this is my new commit\n  and" in log_out
909.1.5 by Aaron Bentley
Fixed log -v (mostly)
740
        assert "rename nested" not in log_out
741
        assert 'revision-id' not in log_out
1185.3.25 by Martin Pool
- run blackbox tests in-process
742
        assert 'revision-id' in capture('log --show-ids -m commit')
736 by Martin Pool
- move old blackbox code from testbzr into bzrlib.selftest.blackbox
743
1185.12.25 by Aaron Bentley
Added one-line log format
744
        log_out = capture('log --line')
745
        for line in log_out.splitlines():
746
            assert len(line) <= 79, len(line)
747
        assert "this is my new commit and" in log_out
748
736 by Martin Pool
- move old blackbox code from testbzr into bzrlib.selftest.blackbox
749
750
        progress("file with spaces in name")
751
        mkdir('sub directory')
752
        file('sub directory/file with spaces ', 'wt').write('see how this works\n')
898 by Martin Pool
- add new runbzr method for external tests
753
        runbzr('add .')
754
        runbzr('diff')
755
        runbzr('commit -m add-spaces')
756
        runbzr('check')
757
758
        runbzr('log')
759
        runbzr('log --forward')
760
761
        runbzr('info')
1092.1.35 by Robert Collins
merge from mpool up to rev 1110
762
1092.2.6 by Robert Collins
symlink support updated to work
763
        if has_symlinks():
764
            progress("symlinks")
765
            mkdir('symlinks')
766
            chdir('symlinks')
767
            runbzr('init')
768
            os.symlink("NOWHERE1", "link1")
769
            runbzr('add link1')
1092.3.4 by Robert Collins
update symlink branch to integration
770
            assert self.capture('unknowns') == ''
1092.2.6 by Robert Collins
symlink support updated to work
771
            runbzr(['commit', '-m', '1: added symlink link1'])
772
    
773
            mkdir('d1')
774
            runbzr('add d1')
1092.3.4 by Robert Collins
update symlink branch to integration
775
            assert self.capture('unknowns') == ''
1092.2.6 by Robert Collins
symlink support updated to work
776
            os.symlink("NOWHERE2", "d1/link2")
1092.3.4 by Robert Collins
update symlink branch to integration
777
            assert self.capture('unknowns') == 'd1/link2\n'
1092.2.6 by Robert Collins
symlink support updated to work
778
            # is d1/link2 found when adding d1
779
            runbzr('add d1')
1092.3.4 by Robert Collins
update symlink branch to integration
780
            assert self.capture('unknowns') == ''
1092.2.6 by Robert Collins
symlink support updated to work
781
            os.symlink("NOWHERE3", "d1/link3")
1092.3.4 by Robert Collins
update symlink branch to integration
782
            assert self.capture('unknowns') == 'd1/link3\n'
1092.2.6 by Robert Collins
symlink support updated to work
783
            runbzr(['commit', '-m', '2: added dir, symlink'])
784
    
785
            runbzr('rename d1 d2')
786
            runbzr('move d2/link2 .')
787
            runbzr('move link1 d2')
788
            assert os.readlink("./link2") == "NOWHERE2"
789
            assert os.readlink("d2/link1") == "NOWHERE1"
790
            runbzr('add d2/link3')
791
            runbzr('diff')
792
            runbzr(['commit', '-m', '3: rename of dir, move symlinks, add link3'])
793
    
794
            os.unlink("link2")
795
            os.symlink("TARGET 2", "link2")
796
            os.unlink("d2/link1")
797
            os.symlink("TARGET 1", "d2/link1")
798
            runbzr('diff')
1092.3.4 by Robert Collins
update symlink branch to integration
799
            assert self.capture("relpath d2/link1") == "d2/link1\n"
1092.2.6 by Robert Collins
symlink support updated to work
800
            runbzr(['commit', '-m', '4: retarget of two links'])
801
    
802
            runbzr('remove d2/link1')
1092.3.4 by Robert Collins
update symlink branch to integration
803
            assert self.capture('unknowns') == 'd2/link1\n'
1092.2.20 by Robert Collins
symlink and weaves, whaddya know
804
            runbzr(['commit', '-m', '5: remove d2/link1'])
1424 by Robert Collins
add rm alias to remove
805
            # try with the rm alias
806
            runbzr('add d2/link1')
807
            runbzr(['commit', '-m', '6: add d2/link1'])
808
            runbzr('rm d2/link1')
809
            assert self.capture('unknowns') == 'd2/link1\n'
810
            runbzr(['commit', '-m', '7: remove d2/link1'])
1092.2.6 by Robert Collins
symlink support updated to work
811
    
812
            os.mkdir("d1")
813
            runbzr('add d1')
814
            runbzr('rename d2/link3 d1/link3new')
1092.3.4 by Robert Collins
update symlink branch to integration
815
            assert self.capture('unknowns') == 'd2/link1\n'
1424 by Robert Collins
add rm alias to remove
816
            runbzr(['commit', '-m', '8: remove d2/link1, move/rename link3'])
1092.2.6 by Robert Collins
symlink support updated to work
817
            
818
            runbzr(['check'])
819
            
820
            runbzr(['export', '-r', '1', 'exp1.tmp'])
821
            chdir("exp1.tmp")
822
            assert listdir_sorted(".") == [ "link1" ]
823
            assert os.readlink("link1") == "NOWHERE1"
824
            chdir("..")
825
            
826
            runbzr(['export', '-r', '2', 'exp2.tmp'])
827
            chdir("exp2.tmp")
828
            assert listdir_sorted(".") == [ "d1", "link1" ]
829
            chdir("..")
830
            
831
            runbzr(['export', '-r', '3', 'exp3.tmp'])
832
            chdir("exp3.tmp")
833
            assert listdir_sorted(".") == [ "d2", "link2" ]
834
            assert listdir_sorted("d2") == [ "link1", "link3" ]
835
            assert os.readlink("d2/link1") == "NOWHERE1"
836
            assert os.readlink("link2")    == "NOWHERE2"
837
            chdir("..")
838
            
839
            runbzr(['export', '-r', '4', 'exp4.tmp'])
840
            chdir("exp4.tmp")
841
            assert listdir_sorted(".") == [ "d2", "link2" ]
842
            assert os.readlink("d2/link1") == "TARGET 1"
843
            assert os.readlink("link2")    == "TARGET 2"
844
            assert listdir_sorted("d2") == [ "link1", "link3" ]
845
            chdir("..")
846
            
847
            runbzr(['export', '-r', '5', 'exp5.tmp'])
848
            chdir("exp5.tmp")
849
            assert listdir_sorted(".") == [ "d2", "link2" ]
850
            assert os.path.islink("link2")
851
            assert listdir_sorted("d2")== [ "link3" ]
852
            chdir("..")
853
            
1424 by Robert Collins
add rm alias to remove
854
            runbzr(['export', '-r', '8', 'exp6.tmp'])
1092.2.6 by Robert Collins
symlink support updated to work
855
            chdir("exp6.tmp")
1424 by Robert Collins
add rm alias to remove
856
            self.assertEqual(listdir_sorted("."), [ "d1", "d2", "link2"])
1092.2.6 by Robert Collins
symlink support updated to work
857
            assert listdir_sorted("d1") == [ "link3new" ]
858
            assert listdir_sorted("d2") == []
859
            assert os.readlink("d1/link3new") == "NOWHERE3"
860
            chdir("..")
861
        else:
862
            progress("skipping symlink tests")
1400.1.1 by Robert Collins
implement a basic test for the ui branch command from http servers
863
864
865
class HttpTests(TestCaseWithWebserver):
866
    """Test bzr ui commands against remote branches."""
867
868
    def test_branch(self):
869
        os.mkdir('from')
870
        branch = Branch.initialize('from')
871
        branch.commit('empty commit for nonsense', allow_pointless=True)
872
        url = self.get_remote_url('from')
873
        self.run_bzr('branch', url, 'to')
874
        branch = Branch.open('to')
875
        self.assertEqual(1, len(branch.revision_history()))
1185.16.48 by mbp at sourcefrog
- more refactoring of and tests for option parsing
876
1442.1.64 by Robert Collins
Branch.open_containing now returns a tuple (Branch, relative-path).
877
    def test_log(self):
878
        self.build_tree(['branch/', 'branch/file'])
879
        branch = Branch.initialize('branch')
880
        branch.add(['file'])
881
        branch.commit('add file', rev_id='A')
882
        url = self.get_remote_url('branch/file')
883
        output = self.capture('log %s' % url)
884
        self.assertEqual(7, len(output.split('\n')))
885
        
886
887
1185.16.48 by mbp at sourcefrog
- more refactoring of and tests for option parsing
888