/brz/remove-bazaar

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