/brz/remove-bazaar

To get this branch, use:
bzr branch http://gegoxaren.bato24.eu/bzr/brz/remove-bazaar

« back to all changes in this revision

Viewing changes to bzrlib/tests/blackbox/test_missing.py

  • Committer: Robert Collins
  • Date: 2010-07-04 06:22:11 UTC
  • mto: This revision was merged to the branch mainline in revision 5332.
  • Revision ID: robertc@robertcollins.net-20100704062211-tk9hw6bnsn5x47fm
``bzrlib.lsprof.profile`` will no longer silently generate bad threaded
profiles when concurrent profile requests are made. Instead the profile
requests will be serialised. Reentrant requests will now deadlock.
(Robert Collins)

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/blackbox/test_missing.py
1
 
# Copyright (C) 2005, 2008 Canonical Ltd
 
1
# Copyright (C) 2005-2010 Canonical Ltd
2
2
#
3
3
# This program is free software; you can redistribute it and/or modify
4
4
# it under the terms of the GNU General Public License as published by
200
200
                          'Branches are up to date.\n' % location,
201
201
                          lines)
202
202
        self.assertEquals('', err)
 
203
 
 
204
    def test_missing_directory(self):
 
205
        """Test --directory option"""
 
206
 
 
207
        # create a source branch
 
208
        a_tree = self.make_branch_and_tree('a')
 
209
        self.build_tree_contents([('a/a', 'initial\n')])
 
210
        a_tree.add('a')
 
211
        a_tree.commit(message='initial')
 
212
 
 
213
        # clone and add a differing revision
 
214
        b_tree = a_tree.bzrdir.sprout('b').open_workingtree()
 
215
        self.build_tree_contents([('b/a', 'initial\nmore\n')])
 
216
        b_tree.commit(message='more')
 
217
        
 
218
        out2, err2 = self.run_bzr('missing --directory a b', retcode=1)
 
219
        os.chdir('a')
 
220
        out1, err1 = self.run_bzr('missing ../b', retcode=1)
 
221
        self.assertEqualDiff(out1, out2)
 
222
        self.assertEqualDiff(err1, err2)