/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
22
command-line interface.
725 by Martin Pool
doc
23
24
This always reinvokes bzr through a new Python interpreter, which is a
25
bit inefficient but arguably tests in a way more representative of how
26
it's normally invoked.
720 by Martin Pool
- start moving external tests into the testsuite framework
27
"""
28
1185.1.25 by Robert Collins
merge David Clymer's patch for TestCaseInTestDir.runcmd
29
from cStringIO import StringIO
1185.1.41 by Robert Collins
massive patch from Alexander Belchenko - many PEP8 fixes, removes unused function uuid
30
import os
1185.10.1 by Aaron Bentley
Added --basis option to bzr branch
31
import shutil
974.1.26 by aaron.bentley at utoronto
merged mbp@sourcefrog.net-20050817233101-0939da1cf91f2472
32
import sys
974.1.71 by Aaron Bentley
Added test for pull
33
import os
1161 by Martin Pool
- add test that 'bzr add' reports the files as they're added
34
1141 by Martin Pool
- rename FunctionalTest to TestCaseInTempDir
35
from bzrlib.selftest import TestCaseInTempDir, BzrTestBase
1161 by Martin Pool
- add test that 'bzr add' reports the files as they're added
36
from bzrlib.branch import Branch
37
898 by Martin Pool
- add new runbzr method for external tests
38
1141 by Martin Pool
- rename FunctionalTest to TestCaseInTempDir
39
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
40
1185.3.23 by Martin Pool
- run some previously external tests in process
41
    def runbzr(self, args, retcode=0, backtick=False):
898 by Martin Pool
- add new runbzr method for external tests
42
        if isinstance(args, basestring):
43
            args = args.split()
1074 by Martin Pool
- check for email address in BRANCH_ROOT/.bzr/email, so you can
44
45
        if backtick:
1185.3.23 by Martin Pool
- run some previously external tests in process
46
            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
47
        else:
1185.3.23 by Martin Pool
- run some previously external tests in process
48
            return self.run_bzr_captured(args, retcode=retcode)
904 by Martin Pool
- more selftest external-command fixes
49
1142 by Martin Pool
- remove dead code from blackbox tests (pychecker)
50
1102 by Martin Pool
- merge test refactoring from robertc
51
class TestCommands(ExternalBase):
52
53
    def test_help_commands(self):
898 by Martin Pool
- add new runbzr method for external tests
54
        self.runbzr('--help')
55
        self.runbzr('help')
56
        self.runbzr('help commands')
57
        self.runbzr('help help')
58
        self.runbzr('commit -h')
727 by Martin Pool
- move more code to run external commands from testbzr to selftest
59
1102 by Martin Pool
- merge test refactoring from robertc
60
    def test_init_branch(self):
898 by Martin Pool
- add new runbzr method for external tests
61
        self.runbzr(['init'])
732 by Martin Pool
- move more tests into bzr selftest
62
1102 by Martin Pool
- merge test refactoring from robertc
63
    def test_whoami(self):
732 by Martin Pool
- move more tests into bzr selftest
64
        # this should always identify something, if only "john@localhost"
898 by Martin Pool
- add new runbzr method for external tests
65
        self.runbzr("whoami")
66
        self.runbzr("whoami --email")
1074 by Martin Pool
- check for email address in BRANCH_ROOT/.bzr/email, so you can
67
68
        self.assertEquals(self.runbzr("whoami --email",
69
                                      backtick=True).count('@'), 1)
70
        
1102 by Martin Pool
- merge test refactoring from robertc
71
    def test_whoami_branch(self):
72
        """branch specific user identity works."""
1074 by Martin Pool
- check for email address in BRANCH_ROOT/.bzr/email, so you can
73
        self.runbzr('init')
74
        f = file('.bzr/email', 'wt')
75
        f.write('Branch Identity <branch@identi.ty>')
76
        f.close()
1185.6.1 by John Arbash Meinel
Updated the whomai test to handle BZREMAIL
77
        bzr_email = os.environ.get('BZREMAIL')
78
        if bzr_email is not None:
79
            del os.environ['BZREMAIL']
1074 by Martin Pool
- check for email address in BRANCH_ROOT/.bzr/email, so you can
80
        whoami = self.runbzr("whoami",backtick=True)
81
        whoami_email = self.runbzr("whoami --email",backtick=True)
82
        self.assertTrue(whoami.startswith('Branch Identity <branch@identi.ty>'))
83
        self.assertTrue(whoami_email.startswith('branch@identi.ty'))
1185.6.1 by John Arbash Meinel
Updated the whomai test to handle BZREMAIL
84
        # Verify that the environment variable overrides the value 
85
        # in the file
86
        os.environ['BZREMAIL'] = 'Different ID <other@environ.ment>'
87
        whoami = self.runbzr("whoami",backtick=True)
88
        whoami_email = self.runbzr("whoami --email",backtick=True)
89
        self.assertTrue(whoami.startswith('Different ID <other@environ.ment>'))
90
        self.assertTrue(whoami_email.startswith('other@environ.ment'))
91
        if bzr_email is not None:
92
            os.environ['BZREMAIL'] = bzr_email
736 by Martin Pool
- move old blackbox code from testbzr into bzrlib.selftest.blackbox
93
1102 by Martin Pool
- merge test refactoring from robertc
94
    def test_invalid_commands(self):
898 by Martin Pool
- add new runbzr method for external tests
95
        self.runbzr("pants", retcode=1)
96
        self.runbzr("--pants off", retcode=1)
97
        self.runbzr("diff --message foo", retcode=1)
736 by Martin Pool
- move old blackbox code from testbzr into bzrlib.selftest.blackbox
98
1102 by Martin Pool
- merge test refactoring from robertc
99
    def test_empty_commit(self):
898 by Martin Pool
- add new runbzr method for external tests
100
        self.runbzr("init")
885 by Martin Pool
- commit command refuses unless something is changed or --unchanged is given
101
        self.build_tree(['hello.txt'])
898 by Martin Pool
- add new runbzr method for external tests
102
        self.runbzr("commit -m empty", retcode=1)
103
        self.runbzr("add hello.txt")
104
        self.runbzr("commit -m added")
885 by Martin Pool
- commit command refuses unless something is changed or --unchanged is given
105
1102 by Martin Pool
- merge test refactoring from robertc
106
    def test_ignore_patterns(self):
906 by Martin Pool
- split out black-box ignore commands
107
        from bzrlib.branch import Branch
108
        
1185.2.9 by Lalo Martins
getting rid of everything that calls the Branch constructor directly
109
        b = Branch.initialize('.')
906 by Martin Pool
- split out black-box ignore commands
110
        self.assertEquals(list(b.unknowns()), [])
111
112
        file('foo.tmp', 'wt').write('tmp files are ignored')
113
        self.assertEquals(list(b.unknowns()), [])
1185.3.26 by Martin Pool
- remove remaining external executions of bzr
114
        assert self.capture('unknowns') == ''
906 by Martin Pool
- split out black-box ignore commands
115
116
        file('foo.c', 'wt').write('int main() {}')
117
        self.assertEquals(list(b.unknowns()), ['foo.c'])
1185.3.26 by Martin Pool
- remove remaining external executions of bzr
118
        assert self.capture('unknowns') == 'foo.c\n'
906 by Martin Pool
- split out black-box ignore commands
119
120
        self.runbzr(['add', 'foo.c'])
1185.3.26 by Martin Pool
- remove remaining external executions of bzr
121
        assert self.capture('unknowns') == ''
906 by Martin Pool
- split out black-box ignore commands
122
123
        # 'ignore' works when creating the .bzignore file
124
        file('foo.blah', 'wt').write('blah')
125
        self.assertEquals(list(b.unknowns()), ['foo.blah'])
126
        self.runbzr('ignore *.blah')
127
        self.assertEquals(list(b.unknowns()), [])
1185.1.41 by Robert Collins
massive patch from Alexander Belchenko - many PEP8 fixes, removes unused function uuid
128
        assert file('.bzrignore', 'rU').read() == '*.blah\n'
906 by Martin Pool
- split out black-box ignore commands
129
130
        # 'ignore' works when then .bzrignore file already exists
131
        file('garh', 'wt').write('garh')
132
        self.assertEquals(list(b.unknowns()), ['garh'])
1185.3.26 by Martin Pool
- remove remaining external executions of bzr
133
        assert self.capture('unknowns') == 'garh\n'
906 by Martin Pool
- split out black-box ignore commands
134
        self.runbzr('ignore garh')
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\ngarh\n'
1102 by Martin Pool
- merge test refactoring from robertc
137
138
    def test_revert(self):
139
        self.runbzr('init')
140
141
        file('hello', 'wt').write('foo')
142
        self.runbzr('add hello')
143
        self.runbzr('commit -m setup hello')
144
145
        file('goodbye', 'wt').write('baz')
146
        self.runbzr('add goodbye')
147
        self.runbzr('commit -m setup goodbye')
1092.2.18 by Robert Collins
merge from symlink branch
148
1102 by Martin Pool
- merge test refactoring from robertc
149
        file('hello', 'wt').write('bar')
150
        file('goodbye', 'wt').write('qux')
151
        self.runbzr('revert hello')
152
        self.check_file_contents('hello', 'foo')
153
        self.check_file_contents('goodbye', 'qux')
154
        self.runbzr('revert')
155
        self.check_file_contents('goodbye', 'baz')
156
157
        os.mkdir('revertdir')
158
        self.runbzr('add revertdir')
159
        self.runbzr('commit -m f')
160
        os.rmdir('revertdir')
161
        self.runbzr('revert')
162
1092.2.18 by Robert Collins
merge from symlink branch
163
        os.symlink('/unlikely/to/exist', 'symlink')
164
        self.runbzr('add symlink')
165
        self.runbzr('commit -m f')
166
        os.unlink('symlink')
167
        self.runbzr('revert')
168
        
1185.5.8 by John Arbash Meinel
Fixed bzr revert with the new RevisionSpec code.
169
        file('hello', 'wt').write('xyz')
170
        self.runbzr('commit -m xyz hello')
171
        self.runbzr('revert -r 1 hello')
172
        self.check_file_contents('hello', 'foo')
173
        self.runbzr('revert hello')
174
        self.check_file_contents('hello', 'xyz')
1185.8.5 by Aaron Bentley
Fixed non-tree-root bug in branch, revert, merge
175
        os.chdir('revertdir')
176
        self.runbzr('revert')
177
        os.chdir('..')
178
1185.5.8 by John Arbash Meinel
Fixed bzr revert with the new RevisionSpec code.
179
1185.1.8 by Robert Collins
David Clymers patch to use rename rather than mv for two argument non-directory target bzr mv calls.
180
    def test_mv_modes(self):
1102 by Martin Pool
- merge test refactoring from robertc
181
        """Test two modes of operation for mv"""
182
        from bzrlib.branch import Branch
1185.2.9 by Lalo Martins
getting rid of everything that calls the Branch constructor directly
183
        b = Branch.initialize('.')
1102 by Martin Pool
- merge test refactoring from robertc
184
        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
185
        self.run_bzr_captured(['add', self.test_dir])
186
        self.run_bzr_captured(['mv', 'a', 'b'])
187
        self.run_bzr_captured(['mv', 'b', 'subdir'])
188
        self.run_bzr_captured(['mv', 'subdir/b', 'a'])
189
        self.run_bzr_captured(['mv', 'a', 'c', 'subdir'])
190
        self.run_bzr_captured(['mv', 'subdir/a', 'subdir/newa'])
1102 by Martin Pool
- merge test refactoring from robertc
191
1185.1.8 by Robert Collins
David Clymers patch to use rename rather than mv for two argument non-directory target bzr mv calls.
192
1102 by Martin Pool
- merge test refactoring from robertc
193
    def test_main_version(self):
194
        """Check output from version command and master option is reasonable"""
195
        # output is intentionally passed through to stdout so that we
196
        # can see the version being tested
197
        output = self.runbzr('version', backtick=1)
198
        self.log('bzr version output:')
199
        self.log(output)
200
        self.assert_(output.startswith('bzr (bazaar-ng) '))
201
        self.assertNotEqual(output.index('Canonical'), -1)
202
        # make sure --version is consistent
203
        tmp_output = self.runbzr('--version', backtick=1)
204
        self.log('bzr --version output:')
205
        self.log(tmp_output)
206
        self.assertEquals(output, tmp_output)
906 by Martin Pool
- split out black-box ignore commands
207
1092.1.39 by Robert Collins
merge from mpool
208
    def example_branch(test):
209
        test.runbzr('init')
210
        file('hello', 'wt').write('foo')
211
        test.runbzr('add hello')
212
        test.runbzr('commit -m setup hello')
213
        file('goodbye', 'wt').write('baz')
214
        test.runbzr('add goodbye')
215
        test.runbzr('commit -m setup goodbye')
216
1185.4.1 by Lalo Martins
blackbox tests for diff
217
    def test_diff(self):
218
        self.example_branch()
219
        file('hello', 'wt').write('hello world!')
220
        self.runbzr('commit -m fixing hello')
221
        output = self.runbzr('diff -r 2..3', backtick=1)
222
        self.assert_('\n+hello world!' in output)
223
        output = self.runbzr('diff -r last:3..last:1', backtick=1)
224
        self.assert_('\n+baz' in output)
225
1185.8.4 by Aaron Bentley
Fixed branch -r
226
    def test_branch(self):
227
        """Branch from one branch to another."""
228
        os.mkdir('a')
229
        os.chdir('a')
230
        self.example_branch()
231
        os.chdir('..')
232
        self.runbzr('branch a b')
233
        self.runbzr('branch a c -r 1')
1185.10.1 by Aaron Bentley
Added --basis option to bzr branch
234
        os.chdir('b')
235
        self.runbzr('commit -m foo --unchanged')
236
        os.chdir('..')
1391 by Robert Collins
merge from integration
237
        # naughty - abstraction violations RBC 20050928  
1393 by Robert Collins
reenable remotebranch tests
238
        print "test_branch used to delete the stores, how is this meant to work ?"
239
        #shutil.rmtree('a/.bzr/revision-store')
240
        #shutil.rmtree('a/.bzr/inventory-store', ignore_errors=True)
241
        #shutil.rmtree('a/.bzr/text-store', ignore_errors=True)
1185.10.1 by Aaron Bentley
Added --basis option to bzr branch
242
        self.runbzr('branch a d --basis b')
1185.8.4 by Aaron Bentley
Fixed branch -r
243
1092.1.39 by Robert Collins
merge from mpool
244
    def test_merge(self):
245
        from bzrlib.branch import Branch
1139 by Martin Pool
- merge in merge improvements and additional tests
246
        
1092.1.39 by Robert Collins
merge from mpool
247
        os.mkdir('a')
248
        os.chdir('a')
249
        self.example_branch()
250
        os.chdir('..')
251
        self.runbzr('branch a b')
252
        os.chdir('b')
253
        file('goodbye', 'wt').write('quux')
254
        self.runbzr(['commit',  '-m',  "more u's are always good"])
255
256
        os.chdir('../a')
257
        file('hello', 'wt').write('quuux')
258
        # We can't merge when there are in-tree changes
259
        self.runbzr('merge ../b', retcode=1)
260
        self.runbzr(['commit', '-m', "Like an epidemic of u's"])
261
        self.runbzr('merge ../b')
262
        self.check_file_contents('goodbye', 'quux')
263
        # Merging a branch pulls its revision into the tree
1185.2.9 by Lalo Martins
getting rid of everything that calls the Branch constructor directly
264
        a = Branch.open('.')
265
        b = Branch.open('../b')
1241 by Martin Pool
- rename last_patch to last_revision
266
        a.get_revision_xml(b.last_revision())
1139 by Martin Pool
- merge in merge improvements and additional tests
267
        self.log('pending merges: %s', a.pending_merges())
1241 by Martin Pool
- rename last_patch to last_revision
268
        #        assert a.pending_merges() == [b.last_revision()], "Assertion %s %s" \
269
        #        % (a.pending_merges(), b.last_revision())
1161 by Martin Pool
- add test that 'bzr add' reports the files as they're added
270
974.1.71 by Aaron Bentley
Added test for pull
271
    def test_pull(self):
272
        """Pull changes from one branch to another."""
273
        os.mkdir('a')
274
        os.chdir('a')
275
276
        self.example_branch()
974.1.79 by Aaron Bentley
Fixed issues with pull not having a default location after branch
277
        self.runbzr('pull', retcode=1)
278
        self.runbzr('missing', retcode=1)
279
        self.runbzr('missing .')
280
        self.runbzr('missing')
281
        self.runbzr('pull')
282
        self.runbzr('pull /', retcode=1)
283
        self.runbzr('pull')
284
974.1.71 by Aaron Bentley
Added test for pull
285
        os.chdir('..')
286
        self.runbzr('branch a b')
287
        os.chdir('b')
974.1.79 by Aaron Bentley
Fixed issues with pull not having a default location after branch
288
        self.runbzr('pull')
1185.8.5 by Aaron Bentley
Fixed non-tree-root bug in branch, revert, merge
289
        os.mkdir('subdir')
290
        self.runbzr('add subdir')
974.1.71 by Aaron Bentley
Added test for pull
291
        self.runbzr('commit -m blah --unchanged')
292
        os.chdir('../a')
1185.2.16 by Lalo Martins
fixing a few tests that came on the merge, for the new constructors
293
        a = Branch.open('.')
294
        b = Branch.open('../b')
974.1.71 by Aaron Bentley
Added test for pull
295
        assert a.revision_history() == b.revision_history()[:-1]
296
        self.runbzr('pull ../b')
297
        assert a.revision_history() == b.revision_history()
298
        self.runbzr('commit -m blah2 --unchanged')
299
        os.chdir('../b')
300
        self.runbzr('commit -m blah3 --unchanged')
301
        self.runbzr('pull ../a', retcode=1)
1390 by Robert Collins
pair programming worx... merge integration and weave
302
        print "DECIDE IF PULL CAN CONVERGE, blackbox.py"
1391 by Robert Collins
merge from integration
303
        return
974.1.74 by Aaron Bentley
Made pull work after remote branch has merged latest revision
304
        os.chdir('../a')
305
        self.runbzr('merge ../b')
306
        self.runbzr('commit -m blah4 --unchanged')
1185.8.5 by Aaron Bentley
Fixed non-tree-root bug in branch, revert, merge
307
        os.chdir('../b/subdir')
308
        self.runbzr('pull ../../a')
974.1.74 by Aaron Bentley
Made pull work after remote branch has merged latest revision
309
        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
310
        self.runbzr('commit -m blah5 --unchanged')
311
        self.runbzr('commit -m blah6 --unchanged')
312
        os.chdir('..')
313
        self.runbzr('pull ../a')
314
        os.chdir('../a')
315
        self.runbzr('commit -m blah7 --unchanged')
316
        self.runbzr('merge ../b')
317
        self.runbzr('commit -m blah8 --unchanged')
318
        self.runbzr('pull ../b')
319
        self.runbzr('pull ../b')
974.1.74 by Aaron Bentley
Made pull work after remote branch has merged latest revision
320
        
1161 by Martin Pool
- add test that 'bzr add' reports the files as they're added
321
    def test_add_reports(self):
322
        """add command prints the names of added files."""
1185.2.9 by Lalo Martins
getting rid of everything that calls the Branch constructor directly
323
        b = Branch.initialize('.')
1161 by Martin Pool
- add test that 'bzr add' reports the files as they're added
324
        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
325
        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
326
        # 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
327
        results = sorted(out.rstrip('\n').split('\n'))
1161 by Martin Pool
- add test that 'bzr add' reports the files as they're added
328
        self.assertEquals(['added dir',
1185.1.41 by Robert Collins
massive patch from Alexander Belchenko - many PEP8 fixes, removes unused function uuid
329
                           'added dir'+os.sep+'sub.txt',
1161 by Martin Pool
- add test that 'bzr add' reports the files as they're added
330
                           'added top.txt',],
331
                          results)
332
1185.3.20 by Martin Pool
- run_bzr_captured also includes logged errors in
333
    def test_unknown_command(self):
334
        """Handling of unknown command."""
335
        out, err = self.run_bzr_captured(['fluffy-badger'],
336
                                         retcode=1)
337
        self.assertEquals(out, '')
338
        err.index('unknown command')
339
        
340
1092.2.6 by Robert Collins
symlink support updated to work
341
342
def has_symlinks():
343
    if hasattr(os, 'symlink'):
344
        return True
345
    else:
346
        return False
347
348
def listdir_sorted(dir):
349
    L = os.listdir(dir)
350
    L.sort()
351
    return L
352
1092.2.12 by Robert Collins
merge from HEAD
353
904 by Martin Pool
- more selftest external-command fixes
354
class OldTests(ExternalBase):
1092.1.39 by Robert Collins
merge from mpool
355
    """old tests moved from ./testbzr."""
356
1102 by Martin Pool
- merge test refactoring from robertc
357
    def test_bzr(self):
736 by Martin Pool
- move old blackbox code from testbzr into bzrlib.selftest.blackbox
358
        from os import chdir, mkdir
359
        from os.path import exists
360
904 by Martin Pool
- more selftest external-command fixes
361
        runbzr = self.runbzr
1185.3.26 by Martin Pool
- remove remaining external executions of bzr
362
        capture = self.capture
736 by Martin Pool
- move old blackbox code from testbzr into bzrlib.selftest.blackbox
363
        progress = self.log
364
365
        progress("basic branch creation")
904 by Martin Pool
- more selftest external-command fixes
366
        mkdir('branch1')
736 by Martin Pool
- move old blackbox code from testbzr into bzrlib.selftest.blackbox
367
        chdir('branch1')
898 by Martin Pool
- add new runbzr method for external tests
368
        runbzr('init')
736 by Martin Pool
- move old blackbox code from testbzr into bzrlib.selftest.blackbox
369
1185.3.25 by Martin Pool
- run blackbox tests in-process
370
        self.assertEquals(capture('root').rstrip(),
736 by Martin Pool
- move old blackbox code from testbzr into bzrlib.selftest.blackbox
371
                          os.path.join(self.test_dir, 'branch1'))
372
373
        progress("status of new file")
374
375
        f = file('test.txt', 'wt')
376
        f.write('hello world!\n')
377
        f.close()
378
1185.3.25 by Martin Pool
- run blackbox tests in-process
379
        self.assertEquals(capture('unknowns'), 'test.txt\n')
736 by Martin Pool
- move old blackbox code from testbzr into bzrlib.selftest.blackbox
380
1185.3.25 by Martin Pool
- run blackbox tests in-process
381
        out = capture("status")
736 by Martin Pool
- move old blackbox code from testbzr into bzrlib.selftest.blackbox
382
        assert out == 'unknown:\n  test.txt\n'
383
1185.3.25 by Martin Pool
- run blackbox tests in-process
384
        out = capture("status --all")
736 by Martin Pool
- move old blackbox code from testbzr into bzrlib.selftest.blackbox
385
        assert out == "unknown:\n  test.txt\n"
386
1185.3.25 by Martin Pool
- run blackbox tests in-process
387
        out = capture("status test.txt --all")
736 by Martin Pool
- move old blackbox code from testbzr into bzrlib.selftest.blackbox
388
        assert out == "unknown:\n  test.txt\n"
389
390
        f = file('test2.txt', 'wt')
391
        f.write('goodbye cruel world...\n')
392
        f.close()
393
1185.3.25 by Martin Pool
- run blackbox tests in-process
394
        out = capture("status test.txt")
736 by Martin Pool
- move old blackbox code from testbzr into bzrlib.selftest.blackbox
395
        assert out == "unknown:\n  test.txt\n"
396
1185.3.25 by Martin Pool
- run blackbox tests in-process
397
        out = capture("status")
736 by Martin Pool
- move old blackbox code from testbzr into bzrlib.selftest.blackbox
398
        assert out == ("unknown:\n"
399
                       "  test.txt\n"
400
                       "  test2.txt\n")
401
402
        os.unlink('test2.txt')
403
404
        progress("command aliases")
1185.3.25 by Martin Pool
- run blackbox tests in-process
405
        out = capture("st --all")
736 by Martin Pool
- move old blackbox code from testbzr into bzrlib.selftest.blackbox
406
        assert out == ("unknown:\n"
407
                       "  test.txt\n")
408
1185.3.25 by Martin Pool
- run blackbox tests in-process
409
        out = capture("stat")
736 by Martin Pool
- move old blackbox code from testbzr into bzrlib.selftest.blackbox
410
        assert out == ("unknown:\n"
411
                       "  test.txt\n")
412
413
        progress("command help")
898 by Martin Pool
- add new runbzr method for external tests
414
        runbzr("help st")
415
        runbzr("help")
416
        runbzr("help commands")
417
        runbzr("help slartibartfast", 1)
736 by Martin Pool
- move old blackbox code from testbzr into bzrlib.selftest.blackbox
418
1185.3.25 by Martin Pool
- run blackbox tests in-process
419
        out = capture("help ci")
736 by Martin Pool
- move old blackbox code from testbzr into bzrlib.selftest.blackbox
420
        out.index('aliases: ')
421
422
        progress("can't rename unversioned file")
898 by Martin Pool
- add new runbzr method for external tests
423
        runbzr("rename test.txt new-test.txt", 1)
736 by Martin Pool
- move old blackbox code from testbzr into bzrlib.selftest.blackbox
424
425
        progress("adding a file")
426
898 by Martin Pool
- add new runbzr method for external tests
427
        runbzr("add test.txt")
1185.3.25 by Martin Pool
- run blackbox tests in-process
428
        assert capture("unknowns") == ''
429
        assert capture("status --all") == ("added:\n"
736 by Martin Pool
- move old blackbox code from testbzr into bzrlib.selftest.blackbox
430
                                                "  test.txt\n")
431
432
        progress("rename newly-added file")
898 by Martin Pool
- add new runbzr method for external tests
433
        runbzr("rename test.txt hello.txt")
736 by Martin Pool
- move old blackbox code from testbzr into bzrlib.selftest.blackbox
434
        assert os.path.exists("hello.txt")
435
        assert not os.path.exists("test.txt")
436
1185.3.25 by Martin Pool
- run blackbox tests in-process
437
        assert capture("revno") == '0\n'
736 by Martin Pool
- move old blackbox code from testbzr into bzrlib.selftest.blackbox
438
439
        progress("add first revision")
904 by Martin Pool
- more selftest external-command fixes
440
        runbzr(['commit', '-m', 'add first revision'])
736 by Martin Pool
- move old blackbox code from testbzr into bzrlib.selftest.blackbox
441
442
        progress("more complex renames")
443
        os.mkdir("sub1")
898 by Martin Pool
- add new runbzr method for external tests
444
        runbzr("rename hello.txt sub1", 1)
445
        runbzr("rename hello.txt sub1/hello.txt", 1)
446
        runbzr("move hello.txt sub1", 1)
736 by Martin Pool
- move old blackbox code from testbzr into bzrlib.selftest.blackbox
447
898 by Martin Pool
- add new runbzr method for external tests
448
        runbzr("add sub1")
449
        runbzr("rename sub1 sub2")
450
        runbzr("move hello.txt sub2")
1185.3.25 by Martin Pool
- run blackbox tests in-process
451
        assert capture("relpath sub2/hello.txt") == os.path.join("sub2", "hello.txt\n")
736 by Martin Pool
- move old blackbox code from testbzr into bzrlib.selftest.blackbox
452
453
        assert exists("sub2")
454
        assert exists("sub2/hello.txt")
455
        assert not exists("sub1")
456
        assert not exists("hello.txt")
457
898 by Martin Pool
- add new runbzr method for external tests
458
        runbzr(['commit', '-m', 'commit with some things moved to subdirs'])
736 by Martin Pool
- move old blackbox code from testbzr into bzrlib.selftest.blackbox
459
460
        mkdir("sub1")
898 by Martin Pool
- add new runbzr method for external tests
461
        runbzr('add sub1')
462
        runbzr('move sub2/hello.txt sub1')
736 by Martin Pool
- move old blackbox code from testbzr into bzrlib.selftest.blackbox
463
        assert not exists('sub2/hello.txt')
464
        assert exists('sub1/hello.txt')
898 by Martin Pool
- add new runbzr method for external tests
465
        runbzr('move sub2 sub1')
736 by Martin Pool
- move old blackbox code from testbzr into bzrlib.selftest.blackbox
466
        assert not exists('sub2')
467
        assert exists('sub1/sub2')
468
898 by Martin Pool
- add new runbzr method for external tests
469
        runbzr(['commit', '-m', 'rename nested subdirectories'])
736 by Martin Pool
- move old blackbox code from testbzr into bzrlib.selftest.blackbox
470
471
        chdir('sub1/sub2')
1185.3.25 by Martin Pool
- run blackbox tests in-process
472
        self.assertEquals(capture('root')[:-1],
736 by Martin Pool
- move old blackbox code from testbzr into bzrlib.selftest.blackbox
473
                          os.path.join(self.test_dir, 'branch1'))
898 by Martin Pool
- add new runbzr method for external tests
474
        runbzr('move ../hello.txt .')
736 by Martin Pool
- move old blackbox code from testbzr into bzrlib.selftest.blackbox
475
        assert exists('./hello.txt')
1185.3.25 by Martin Pool
- run blackbox tests in-process
476
        self.assertEquals(capture('relpath hello.txt'),
477
                          os.path.join('sub1', 'sub2', 'hello.txt') + '\n')
478
        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
479
        runbzr(['commit', '-m', 'move to parent directory'])
736 by Martin Pool
- move old blackbox code from testbzr into bzrlib.selftest.blackbox
480
        chdir('..')
1185.3.25 by Martin Pool
- run blackbox tests in-process
481
        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
482
898 by Martin Pool
- add new runbzr method for external tests
483
        runbzr('move sub2/hello.txt .')
736 by Martin Pool
- move old blackbox code from testbzr into bzrlib.selftest.blackbox
484
        assert exists('hello.txt')
485
486
        f = file('hello.txt', 'wt')
487
        f.write('some nice new content\n')
488
        f.close()
489
490
        f = file('msg.tmp', 'wt')
491
        f.write('this is my new commit\n')
492
        f.close()
493
898 by Martin Pool
- add new runbzr method for external tests
494
        runbzr('commit -F msg.tmp')
736 by Martin Pool
- move old blackbox code from testbzr into bzrlib.selftest.blackbox
495
1185.3.25 by Martin Pool
- run blackbox tests in-process
496
        assert capture('revno') == '5\n'
898 by Martin Pool
- add new runbzr method for external tests
497
        runbzr('export -r 5 export-5.tmp')
498
        runbzr('export export.tmp')
736 by Martin Pool
- move old blackbox code from testbzr into bzrlib.selftest.blackbox
499
898 by Martin Pool
- add new runbzr method for external tests
500
        runbzr('log')
501
        runbzr('log -v')
909.1.5 by Aaron Bentley
Fixed log -v (mostly)
502
        runbzr('log -v --forward')
503
        runbzr('log -m', retcode=1)
1185.3.25 by Martin Pool
- run blackbox tests in-process
504
        log_out = capture('log -m commit')
909.1.5 by Aaron Bentley
Fixed log -v (mostly)
505
        assert "this is my new commit" in log_out
506
        assert "rename nested" not in log_out
507
        assert 'revision-id' not in log_out
1185.3.25 by Martin Pool
- run blackbox tests in-process
508
        assert 'revision-id' in capture('log --show-ids -m commit')
736 by Martin Pool
- move old blackbox code from testbzr into bzrlib.selftest.blackbox
509
510
511
        progress("file with spaces in name")
512
        mkdir('sub directory')
513
        file('sub directory/file with spaces ', 'wt').write('see how this works\n')
898 by Martin Pool
- add new runbzr method for external tests
514
        runbzr('add .')
515
        runbzr('diff')
516
        runbzr('commit -m add-spaces')
517
        runbzr('check')
518
519
        runbzr('log')
520
        runbzr('log --forward')
521
522
        runbzr('info')
1092.1.35 by Robert Collins
merge from mpool up to rev 1110
523
1092.2.6 by Robert Collins
symlink support updated to work
524
        if has_symlinks():
525
            progress("symlinks")
526
            mkdir('symlinks')
527
            chdir('symlinks')
528
            runbzr('init')
529
            os.symlink("NOWHERE1", "link1")
530
            runbzr('add link1')
1092.3.4 by Robert Collins
update symlink branch to integration
531
            assert self.capture('unknowns') == ''
1092.2.6 by Robert Collins
symlink support updated to work
532
            runbzr(['commit', '-m', '1: added symlink link1'])
533
    
534
            mkdir('d1')
535
            runbzr('add d1')
1092.3.4 by Robert Collins
update symlink branch to integration
536
            assert self.capture('unknowns') == ''
1092.2.6 by Robert Collins
symlink support updated to work
537
            os.symlink("NOWHERE2", "d1/link2")
1092.3.4 by Robert Collins
update symlink branch to integration
538
            assert self.capture('unknowns') == 'd1/link2\n'
1092.2.6 by Robert Collins
symlink support updated to work
539
            # is d1/link2 found when adding d1
540
            runbzr('add d1')
1092.3.4 by Robert Collins
update symlink branch to integration
541
            assert self.capture('unknowns') == ''
1092.2.6 by Robert Collins
symlink support updated to work
542
            os.symlink("NOWHERE3", "d1/link3")
1092.3.4 by Robert Collins
update symlink branch to integration
543
            assert self.capture('unknowns') == 'd1/link3\n'
1092.2.6 by Robert Collins
symlink support updated to work
544
            runbzr(['commit', '-m', '2: added dir, symlink'])
545
    
546
            runbzr('rename d1 d2')
547
            runbzr('move d2/link2 .')
548
            runbzr('move link1 d2')
549
            assert os.readlink("./link2") == "NOWHERE2"
550
            assert os.readlink("d2/link1") == "NOWHERE1"
551
            runbzr('add d2/link3')
552
            runbzr('diff')
553
            runbzr(['commit', '-m', '3: rename of dir, move symlinks, add link3'])
554
    
555
            os.unlink("link2")
556
            os.symlink("TARGET 2", "link2")
557
            os.unlink("d2/link1")
558
            os.symlink("TARGET 1", "d2/link1")
559
            runbzr('diff')
1092.3.4 by Robert Collins
update symlink branch to integration
560
            assert self.capture("relpath d2/link1") == "d2/link1\n"
1092.2.6 by Robert Collins
symlink support updated to work
561
            runbzr(['commit', '-m', '4: retarget of two links'])
562
    
563
            runbzr('remove d2/link1')
1092.3.4 by Robert Collins
update symlink branch to integration
564
            assert self.capture('unknowns') == 'd2/link1\n'
1092.2.20 by Robert Collins
symlink and weaves, whaddya know
565
            runbzr(['commit', '-m', '5: remove d2/link1'])
1092.2.6 by Robert Collins
symlink support updated to work
566
    
567
            os.mkdir("d1")
568
            runbzr('add d1')
569
            runbzr('rename d2/link3 d1/link3new')
1092.3.4 by Robert Collins
update symlink branch to integration
570
            assert self.capture('unknowns') == 'd2/link1\n'
1092.2.6 by Robert Collins
symlink support updated to work
571
            runbzr(['commit', '-m', '6: remove d2/link1, move/rename link3'])
572
            
573
            runbzr(['check'])
574
            
575
            runbzr(['export', '-r', '1', 'exp1.tmp'])
576
            chdir("exp1.tmp")
577
            assert listdir_sorted(".") == [ "link1" ]
578
            assert os.readlink("link1") == "NOWHERE1"
579
            chdir("..")
580
            
581
            runbzr(['export', '-r', '2', 'exp2.tmp'])
582
            chdir("exp2.tmp")
583
            assert listdir_sorted(".") == [ "d1", "link1" ]
584
            chdir("..")
585
            
586
            runbzr(['export', '-r', '3', 'exp3.tmp'])
587
            chdir("exp3.tmp")
588
            assert listdir_sorted(".") == [ "d2", "link2" ]
589
            assert listdir_sorted("d2") == [ "link1", "link3" ]
590
            assert os.readlink("d2/link1") == "NOWHERE1"
591
            assert os.readlink("link2")    == "NOWHERE2"
592
            chdir("..")
593
            
594
            runbzr(['export', '-r', '4', 'exp4.tmp'])
595
            chdir("exp4.tmp")
596
            assert listdir_sorted(".") == [ "d2", "link2" ]
597
            assert os.readlink("d2/link1") == "TARGET 1"
598
            assert os.readlink("link2")    == "TARGET 2"
599
            assert listdir_sorted("d2") == [ "link1", "link3" ]
600
            chdir("..")
601
            
602
            runbzr(['export', '-r', '5', 'exp5.tmp'])
603
            chdir("exp5.tmp")
604
            assert listdir_sorted(".") == [ "d2", "link2" ]
605
            assert os.path.islink("link2")
606
            assert listdir_sorted("d2")== [ "link3" ]
607
            chdir("..")
608
            
609
            runbzr(['export', '-r', '6', 'exp6.tmp'])
610
            chdir("exp6.tmp")
611
            assert listdir_sorted(".") == [ "d1", "d2", "link2" ]
612
            assert listdir_sorted("d1") == [ "link3new" ]
613
            assert listdir_sorted("d2") == []
614
            assert os.readlink("d1/link3new") == "NOWHERE3"
615
            chdir("..")
616
        else:
617
            progress("skipping symlink tests")
618