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