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