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